thepopebot 1.2.74-beta.50 → 1.2.74-beta.52

package/lib/ai/model.js

@@ -25,7 +25,7 @@ export async function createModel(options = {}) {
     const { getCustomProvider } = await import('../db/config.js');
     const custom = getCustomProvider(provider);
     if (!custom) throw new Error(`Unknown LLM provider: ${provider}`);
-    const config = { modelName: custom.model || modelName, maxTokens };
+    const config = { modelName: custom.models?.[0] || modelName, maxTokens };
     config.apiKey = custom.apiKey || 'not-needed';
     if (custom.baseUrl) {
       config.configuration = { baseURL: custom.baseUrl };

package/lib/chat/components/message.js

@@ -148,26 +148,19 @@ function ToolCall({ part, className }) {
         className: "flex w-full items-center gap-2 px-3 py-2 text-left text-sm hover:bg-muted/50 rounded-lg",
         children: [
           /* @__PURE__ */ jsx(WrenchIcon, { size: 14, className: "text-muted-foreground shrink-0 mt-0.5" }),
-          /* @__PURE__ */ jsxs("span", { className: "flex flex-col min-w-0 flex-1", children: [
-            /* @__PURE__ */ jsxs("span", { className: "flex items-center gap-2", children: [
-              /* @__PURE__ */ jsx("span", { className: "font-medium text-foreground", children: displayName }),
-              isDone && (() => {
-                try {
-                  const o = typeof part.output === "string" ? JSON.parse(part.output) : part.output;
-                  if (o?.codingAgent || o?.backendApi) {
-                    return /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: o.backendApi || o.codingAgent });
-                  }
-                } catch {
+          /* @__PURE__ */ jsx("span", { className: "flex flex-col min-w-0 flex-1", children: /* @__PURE__ */ jsxs("span", { className: "flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx("span", { className: "font-medium text-foreground", children: displayName }),
+            isDone && (() => {
+              try {
+                const o = typeof part.output === "string" ? JSON.parse(part.output) : part.output;
+                if (o?.codingAgent || o?.backendApi) {
+                  return /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: [o.codingAgent, o.backendApi].filter(Boolean).join(" \xB7 ") });
                 }
-                return null;
-              })()
-            ] }),
-            (() => {
-              const prompt = part.input?.prompt;
-              if (!prompt) return null;
-              return /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground whitespace-pre-wrap", children: prompt });
+              } catch {
+              }
+              return null;
             })()
-          ] }),
+          ] }) }),
           /* @__PURE__ */ jsxs("span", { className: "ml-auto flex items-center gap-1.5 text-xs text-muted-foreground shrink-0", children: [
             isRunning && /* @__PURE__ */ jsxs(Fragment, { children: [
               /* @__PURE__ */ jsx(SpinnerIcon, { size: 12 }),

package/lib/chat/components/message.jsx

@@ -160,7 +160,7 @@ function ToolCall({ part, className }) {
                 if (o?.codingAgent || o?.backendApi) {
                   return (
                     <span className="text-xs text-muted-foreground">
-                      {o.backendApi || o.codingAgent}
+                      {[o.codingAgent, o.backendApi].filter(Boolean).join(' · ')}
                     </span>
                   );
                 }
@@ -168,13 +168,15 @@ function ToolCall({ part, className }) {
               return null;
             })()}
           </span>
+          {/* DISABLED — may be re-enabled later. Do NOT remove from codebase.
+             Shows the tool's prompt text as a subtitle below the tool name.
           {(() => {
             const prompt = part.input?.prompt;
             if (!prompt) return null;
             return (
               <span className="text-xs text-muted-foreground whitespace-pre-wrap">{prompt}</span>
             );
-          })()}
+          })()} */}
         </span>
         <span className="ml-auto flex items-center gap-1.5 text-xs text-muted-foreground shrink-0">
           {isRunning && (

package/lib/chat/components/settings-chat-page.js

@@ -51,6 +51,7 @@ function ChatConfigPage() {
 function ActiveConfig({ settings, onSave }) {
   const [provider, setProvider] = useState("");
   const [model, setModel] = useState("");
+  const [modelText, setModelText] = useState("");
   const [maxTokens, setMaxTokens] = useState("4096");
   const [saving, setSaving] = useState(false);
   const [saved, setSaved] = useState(false);
@@ -60,6 +61,7 @@ function ActiveConfig({ settings, onSave }) {
     if (settings?.active) {
       setProvider(settings.active.provider || "anthropic");
       setModel(settings.active.model || "");
+      setModelText(settings.active.model || "");
       setMaxTokens(settings.active.maxTokens || "4096");
       setTimeout(() => {
         initialized.current = true;
@@ -92,77 +94,88 @@ function ActiveConfig({ settings, onSave }) {
   }
   if (settings?.customProviders) {
     for (const cp of settings.customProviders) {
-      availableProviders.push({ slug: cp.key, name: cp.name, models: null, customModel: cp.model });
+      availableProviders.push({ slug: cp.key, name: cp.name, models: cp.models.map((m) => ({ id: m, name: m })) });
     }
   }
-  const selectedBuiltin = settings?.builtinProviders?.[provider];
+  const selectedProvider = availableProviders.find((p) => p.slug === provider);
   const handleProviderChange = (slug) => {
     setProvider(slug);
-    const bp = settings?.builtinProviders?.[slug];
-    let newModel;
-    if (bp) {
-      const def = bp.models.find((m) => m.default);
-      newModel = def?.id || bp.models[0]?.id || "";
-    } else {
-      const cp = settings?.customProviders?.find((c) => c.key === slug);
-      newModel = cp?.model || "";
-    }
+    const prov = availableProviders.find((p) => p.slug === slug);
+    const models = prov?.models || [];
+    const def = models.find((m) => m.default);
+    const newModel = def?.id || models[0]?.id || "";
     setModel(newModel);
-    scheduleAutoSave(slug, newModel, maxTokens);
+    setModelText(newModel);
+    if (models.length > 0) {
+      scheduleAutoSave(slug, newModel, maxTokens);
+    }
   };
   const handleModelChange = (m) => {
     setModel(m);
     scheduleAutoSave(provider, m, maxTokens);
   };
+  const handleModelTextSave = () => {
+    setModel(modelText);
+    doSave(provider, modelText, maxTokens);
+  };
+  const savedModel = settings?.active?.model || "";
+  const savedMaxTokens = settings?.active?.maxTokens || "4096";
+  const hasUnsavedChanges = modelText !== savedModel || maxTokens !== savedMaxTokens;
+  const hasModels = (selectedProvider?.models || []).length > 0;
   const handleMaxTokensChange = (mt) => {
     setMaxTokens(mt);
-    scheduleAutoSave(provider, model, mt);
+    if (hasModels) {
+      scheduleAutoSave(provider, model, mt);
+    }
   };
-  return /* @__PURE__ */ jsx("div", { className: "rounded-lg border bg-card p-4", children: /* @__PURE__ */ jsxs("div", { className: "divide-y divide-border", children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3 first:pt-0", children: [
-      /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Provider" }),
-      /* @__PURE__ */ jsxs(
-        "select",
-        {
-          value: provider,
-          onChange: (e) => handleProviderChange(e.target.value),
-          className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
-          children: [
-            availableProviders.map((p) => /* @__PURE__ */ jsx("option", { value: p.slug, children: p.name }, p.slug)),
-            availableProviders.length === 0 && /* @__PURE__ */ jsx("option", { value: "", disabled: true, children: "No providers configured" })
-          ]
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3", children: [
-      /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Model" }),
-      selectedBuiltin ? /* @__PURE__ */ jsx(
-        "select",
-        {
-          value: model,
-          onChange: (e) => handleModelChange(e.target.value),
-          className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
-          children: selectedBuiltin.models.filter((m) => m.chat !== false).map((m) => /* @__PURE__ */ jsx("option", { value: m.id, children: m.name }, m.id))
-        }
-      ) : /* @__PURE__ */ jsx(
-        "input",
-        {
-          type: "text",
-          value: model,
-          onChange: (e) => handleModelChange(e.target.value),
-          placeholder: "Model name",
-          className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
-        }
-      )
+  return /* @__PURE__ */ jsxs("div", { className: "rounded-lg border bg-card p-4", children: [
+    (saving || saved) && /* @__PURE__ */ jsxs("div", { className: "flex justify-end mb-2", children: [
+      saving && /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: "Saving..." }),
+      saved && /* @__PURE__ */ jsxs("span", { className: "text-xs text-green-500 inline-flex items-center gap-1", children: [
+        /* @__PURE__ */ jsx(CheckIcon, { size: 12 }),
+        " Saved"
+      ] })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3 last:pb-0", children: [
-      /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Max Tokens" }),
-      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
-        saving && /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: "Saving..." }),
-        saved && /* @__PURE__ */ jsxs("span", { className: "text-xs text-green-500 inline-flex items-center gap-1", children: [
-          /* @__PURE__ */ jsx(CheckIcon, { size: 12 }),
-          " Saved"
-        ] }),
+    /* @__PURE__ */ jsxs("div", { className: "divide-y divide-border", children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3 first:pt-0", children: [
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Provider" }),
+        /* @__PURE__ */ jsxs(
+          "select",
+          {
+            value: provider,
+            onChange: (e) => handleProviderChange(e.target.value),
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
+            children: [
+              availableProviders.map((p) => /* @__PURE__ */ jsx("option", { value: p.slug, children: p.name }, p.slug)),
+              availableProviders.length === 0 && /* @__PURE__ */ jsx("option", { value: "", disabled: true, children: "No providers configured" })
+            ]
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3", children: [
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Model" }),
+        (selectedProvider?.models || []).length > 0 ? /* @__PURE__ */ jsx(
+          "select",
+          {
+            value: model,
+            onChange: (e) => handleModelChange(e.target.value),
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
+            children: (selectedProvider?.models || []).filter((m) => m.chat !== false).map((m) => /* @__PURE__ */ jsx("option", { value: m.id, children: m.name }, m.id))
+          }
+        ) : /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            value: modelText,
+            onChange: (e) => setModelText(e.target.value),
+            onKeyDown: (e) => e.key === "Enter" && handleModelTextSave(),
+            placeholder: "Model name",
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between py-3 last:pb-0", children: [
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Max Tokens" }),
         /* @__PURE__ */ jsx(
           "input",
           {
@@ -173,8 +186,17 @@ function ActiveConfig({ settings, onSave }) {
           }
         )
       ] })
-    ] })
-  ] }) });
+    ] }),
+    !hasModels && /* @__PURE__ */ jsx("div", { className: "flex justify-end mt-4", children: /* @__PURE__ */ jsx(
+      "button",
+      {
+        onClick: handleModelTextSave,
+        disabled: !hasUnsavedChanges || saving,
+        className: "rounded-md px-3 py-1.5 text-sm font-medium bg-foreground text-background hover:bg-foreground/90 disabled:opacity-50 transition-colors",
+        children: "Save"
+      }
+    ) })
+  ] });
 }
 function ChatProvidersPage() {
   const [settings, setSettings] = useState(null);
@@ -537,8 +559,8 @@ function CustomProviderCard({ provider, onEdit, onRemove }) {
         /* @__PURE__ */ jsx(StatusBadge, { isSet: provider.hasApiKey })
       ] }),
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between py-3", children: [
-        /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsx("span", { className: "text-sm font-medium", children: "Model" }) }),
-        /* @__PURE__ */ jsx("code", { className: "text-xs font-mono text-muted-foreground", children: provider.model })
+        /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsx("span", { className: "text-sm font-medium", children: "Models" }) }),
+        /* @__PURE__ */ jsx("code", { className: "text-xs font-mono text-muted-foreground", children: provider.models.join(", ") })
       ] }),
       /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between py-3", children: [
         /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsx("span", { className: "text-sm font-medium", children: "Base URL" }) }),
@@ -551,7 +573,7 @@ function CustomProviderDialog({ open, initial, onSave, onCancel }) {
   const [name, setName] = useState(initial?.name || "");
   const [baseUrl, setBaseUrl] = useState(initial?.baseUrl || "");
   const [apiKey, setApiKey] = useState("");
-  const [model, setModel] = useState(initial?.model || "");
+  const [models, setModels] = useState(initial?.models?.length ? initial.models : [""]);
   const [saving, setSaving] = useState(false);
   const nameRef = useRef(null);
   useEffect(() => {
@@ -559,19 +581,32 @@ function CustomProviderDialog({ open, initial, onSave, onCancel }) {
       setName(initial?.name || "");
       setBaseUrl(initial?.baseUrl || "");
       setApiKey("");
-      setModel(initial?.model || "");
+      setModels(initial?.models?.length ? [...initial.models] : [""]);
       setSaving(false);
       setTimeout(() => nameRef.current?.focus(), 50);
     }
   }, [open, initial]);
   const handleSubmit = async () => {
     setSaving(true);
-    const config = { name, baseUrl, model };
+    const filteredModels = models.filter((m) => m.trim());
+    const config = { name, baseUrl, models: filteredModels };
     if (apiKey) config.apiKey = apiKey;
     else if (initial?.hasApiKey) config.apiKey = "__keep__";
     await onSave(config);
     setSaving(false);
   };
+  const updateModel = (index, value) => {
+    const next = [...models];
+    next[index] = value;
+    setModels(next);
+  };
+  const removeModel = (index) => {
+    setModels(models.filter((_, i) => i !== index));
+  };
+  const addModel = () => {
+    setModels([...models, ""]);
+  };
+  const hasValidModels = models.some((m) => m.trim());
   return /* @__PURE__ */ jsxs(Dialog, { open, onClose: onCancel, title: initial ? "Edit Provider" : "Add OpenAI Compatible API", children: [
     /* @__PURE__ */ jsxs("div", { className: "space-y-3", children: [
       /* @__PURE__ */ jsxs("div", { children: [
@@ -583,7 +618,7 @@ function CustomProviderDialog({ open, initial, onSave, onCancel }) {
             type: "text",
             value: name,
             onChange: (e) => setName(e.target.value),
-            placeholder: "Together AI",
+            placeholder: "Ollama (model)",
             className: "w-full rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
           }
         )
@@ -622,17 +657,59 @@ function CustomProviderDialog({ open, initial, onSave, onCancel }) {
         )
       ] }),
       /* @__PURE__ */ jsxs("div", { children: [
-        /* @__PURE__ */ jsx("label", { className: "text-xs font-medium mb-1 block", children: "Model" }),
-        /* @__PURE__ */ jsx(
-          "input",
-          {
-            type: "text",
-            value: model,
-            onChange: (e) => setModel(e.target.value),
-            placeholder: "meta-llama/Llama-3-70b-chat",
-            className: "w-full rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
-          }
-        )
+        /* @__PURE__ */ jsx("label", { className: "text-xs font-medium mb-1 block", children: "Models" }),
+        /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
+          models.map((m, i) => /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+            /* @__PURE__ */ jsx(
+              "input",
+              {
+                type: "text",
+                value: m,
+                onChange: (e) => updateModel(i, e.target.value),
+                placeholder: "qwen2.5-coder:3b",
+                className: "w-full rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+              }
+            ),
+            models.length > 1 && /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                onClick: () => removeModel(i),
+                className: "shrink-0 rounded-md px-2 py-1.5 text-xs font-medium border border-border text-muted-foreground hover:text-destructive hover:border-destructive/50 transition-colors",
+                children: "\xD7"
+              }
+            )
+          ] }, i)),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: addModel,
+              className: "text-xs font-medium text-muted-foreground hover:text-foreground transition-colors",
+              children: "+ Add model"
+            }
+          )
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs("div", { className: "rounded-md border border-border bg-muted/50 px-3 py-2.5 text-xs text-muted-foreground space-y-1", children: [
+        /* @__PURE__ */ jsx("p", { className: "font-medium text-foreground", children: "Ollama" }),
+        /* @__PURE__ */ jsxs("p", { children: [
+          "Name: ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono", children: "Ollama (qwen2.5-coder:3b)" })
+        ] }),
+        /* @__PURE__ */ jsxs("p", { children: [
+          "URL: ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono", children: "http://host.docker.internal:11434/v1" })
+        ] }),
+        /* @__PURE__ */ jsxs("p", { children: [
+          "API Key: any value (e.g. ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono", children: "ollama" }),
+          ")"
+        ] }),
+        /* @__PURE__ */ jsxs("p", { children: [
+          "Models: exact names from ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono", children: "ollama list" })
+        ] })
       ] })
     ] }),
     /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2 mt-5", children: [
@@ -641,7 +718,7 @@ function CustomProviderDialog({ open, initial, onSave, onCancel }) {
         "button",
         {
           onClick: handleSubmit,
-          disabled: !name || !baseUrl || !model || saving,
+          disabled: !name || !baseUrl || !hasValidModels || saving,
           className: "rounded-md px-3 py-1.5 text-sm font-medium bg-foreground text-background hover:bg-foreground/90 disabled:opacity-50 transition-colors",
           children: saving ? "Saving..." : initial ? "Save" : "Add"
         }