kiokuko-dsh 0.2.2 → 0.2.4

package/dist/models-client.cjs

@@ -68,6 +68,7 @@ window.__ModuleLoader__.load({
       ollama: ["Ollama", "http://localhost:11434/v1", "chat-completions"],
       custom: ["Custom connection", "http://localhost:8080/v1", "chat-completions"]
     };
+    var OAUTH_KINDS = ["codex", "claude", "xai", "openai", "openrouter", "nous"];
     async function modelsApi(body, query = "") {
       const response = await fetch("/api/kiokuko.models" + query, {
         ...body ? {
@@ -92,6 +93,7 @@ window.__ModuleLoader__.load({
         reasoning: false,
         image: false
       });
+      const [advanced, setAdvanced] = useState(false), [manualOpen, setManualOpen] = useState(false);
       const operation = useRef(void 0), mounted = useRef(true), working = useRef(false);
       const sessionId = props.sessionId;
       const load = async () => {
@@ -133,12 +135,15 @@ window.__ModuleLoader__.load({
         setError("");
         setModels([]);
         try {
-          setModels(await modelsApi(void 0, "?op=models&id=" + encodeURIComponent(c.id)));
+          const list = await modelsApi(void 0, "?op=models&id=" + encodeURIComponent(c.id));
+          setModels(list);
+          return list;
         } catch (e) {
           setError(messageOf(e));
+          return [];
         }
       };
-      const save = async () => {
+      const persist = async () => {
         await modelsApi({
           op: "save",
           connection: {
@@ -150,11 +155,33 @@ window.__ModuleLoader__.load({
             serviceTier: connection.serviceTier,
             models: connection.models
           },
-          revision: state.revision
+          revision: (await load()).revision
         });
-        const next = await load();
-        await choose(next.connections.find((c) => c.id === connection.id));
-        setNotice("Connection saved");
+      };
+      const reopen = async () => {
+        const saved = await load();
+        return choose(saved.connections.find((c) => c.id === connection.id) ?? connection);
+      };
+      const connect = async () => {
+        const draft = { ...connection };
+        await persist();
+        const typed = key.trim();
+        if (typed) {
+          await modelsApi({ op: "key", id: draft.id, key: typed });
+          setKey("");
+        }
+        let failure = "";
+        try {
+          await modelsApi({ op: "refresh", id: draft.id });
+        } catch (e) {
+          failure = messageOf(e);
+        }
+        const list = await reopen();
+        if (failure) {
+          setNotice(typed ? "Connection and key saved" : "Connection saved");
+          setError(failure + " Register a model manually if this endpoint stays unusable.");
+        } else
+          setNotice(list.length ? "Connected \xB7 " + list.length + " model(s)" : "Connected; no models discovered yet");
       };
       const newConnection = (kind) => {
         const spec = MODEL_CONNECTION_DEFAULTS[kind];
@@ -170,10 +197,11 @@ window.__ModuleLoader__.load({
         setModels([]);
         setKey("");
         setError("");
+        setNotice("");
       };
       const update = (field, value) => setConnection({ ...connection, [field]: value });
       const startLogin = async () => {
-        await save();
+        await persist();
         const result = await modelsApi({ op: "login", id: connection.id });
         operation.current = result.operationId;
         setAuth({ id: result.operationId, status: "pending", events: [] });
@@ -189,10 +217,9 @@ window.__ModuleLoader__.load({
             setAuth(next);
             if (next.status !== "pending") {
               operation.current = void 0;
-              void load().then((value) => {
-                if (next.status === "success")
-                  return choose(value.connections.find((c) => c.id === connection.id));
-                setError(next.error ?? "Authentication cancelled");
+              void reopen().then(() => {
+                if (next.status !== "success")
+                  setError(next.error ?? "Authentication cancelled");
               }).catch((e) => setError(messageOf(e)));
             }
           }, (e) => {
@@ -205,7 +232,7 @@ window.__ModuleLoader__.load({
           clearInterval(timer);
         };
       }, [auth?.id, auth?.status]);
-      const input = (label, value, onChange, type = "text") => jsx("label", {
+      const input = (label, value, onChange, type = "text", submit) => jsx("label", {
         children: jsxs(Fragment, {
           children: [
             jsx("span", { children: label }),
@@ -215,6 +242,14 @@ window.__ModuleLoader__.load({
               "aria-label": label,
               disabled: busy || label === "Base URL" && ["codex", "opencode", "opencode-go"].includes(connection?.kind),
               onChange: (e) => onChange(e.target.value),
+              ...submit ? {
+                onKeyDown: (e) => {
+                  if (e.key !== "Enter")
+                    return;
+                  e.preventDefault();
+                  submit();
+                }
+              } : {},
               autoComplete: type === "password" ? "new-password" : "off"
             })
           ]
@@ -235,9 +270,9 @@ window.__ModuleLoader__.load({
           jsx("p", {
             children: "Connect directly for chat, Enno and Deep. Credentials are shared with dsh-cli. Signing out also signs dsh-cli out."
           }),
-          ...error ? [jsx("p", { role: "alert", children: error })] : [],
-          ...notice ? [jsx("p", { role: "status", children: notice })] : [],
-          ...busy ? [jsx("p", { role: "status", children: "Working\u2026" })] : [],
+          ...error ? [jsx("p", { role: "alert", children: error }, "error")] : [],
+          ...notice ? [jsx("p", { role: "status", children: notice }, "notice")] : [],
+          ...busy ? [jsx("p", { role: "status", children: "Working\u2026" }, "busy")] : [],
           button("Reload", () => void run(load)),
           jsx("label", {
             children: jsxs(Fragment, {
@@ -264,99 +299,35 @@ window.__ModuleLoader__.load({
           ...connection ? [
             jsxs("div", {
               className: "kiokuko-models-editor",
+              key: "editor",
               children: [
-                input("Connection name", connection.name, (value) => update("name", value)),
-                input("Base URL", connection.baseURL, (value) => update("baseURL", value)),
-                jsx("label", {
-                  children: jsxs(Fragment, {
-                    children: [
-                      "Protocol",
-                      jsx("select", {
-                        "aria-label": "Protocol",
-                        value: connection.protocol,
-                        disabled: busy || [
-                          "codex",
-                          "infron",
-                          "opencode",
-                          "opencode-go"
-                        ].includes(connection.kind),
-                        onChange: (e) => update("protocol", e.target.value),
-                        children: [
-                          ["chat-completions", "Chat Completions"],
-                          ["responses", "Responses"],
-                          ["messages", "Messages"]
-                        ].map(([id, name]) => jsx("option", { value: id, children: name }, id))
-                      })
-                    ]
-                  })
-                }),
-                ...connection.kind === "infron" ? [
-                  jsx("label", {
-                    children: jsxs(Fragment, {
-                      children: [
-                        "Service tier",
-                        jsx("select", {
-                          "aria-label": "Service tier",
-                          value: connection.serviceTier,
-                          disabled: busy,
-                          onChange: (e) => update("serviceTier", e.target.value),
-                          children: [
-                            jsx("option", {
-                              value: "standard",
-                              children: "Standard"
-                            }),
-                            jsx("option", {
-                              value: "flex",
-                              children: "Flex"
-                            })
-                          ]
-                        })
-                      ]
+                jsxs("h3", {
+                  children: [
+                    connection.name,
+                    jsx("span", {
+                      className: "kiokuko-models-state",
+                      children: " \xB7 " + (connection.authState ?? "not saved yet")
                     })
-                  }),
-                  jsx("p", {
-                    children: "Requested tier: " + connection.serviceTier + ". Last request: " + (connection.lastRequestedTier ?? "none") + ". Actual served tier: " + (connection.actualTier ?? "unknown") + ". Infron may serve Standard for a Flex request."
-                  })
-                ] : [],
-                button("Save connection", () => void run(save)),
+                  ]
+                }),
                 ...connection.kind !== "codex" && connection.kind !== "ollama" ? [
-                  input("API key / bearer token", key, setKey, "password"),
-                  button("Save key", () => void run(async () => {
-                    await save();
-                    await modelsApi({
-                      op: "key",
-                      id: connection.id,
-                      key
-                    });
-                    setKey("");
-                    await load();
-                    await choose(connection);
-                    setNotice("Key saved");
-                  }), !key)
-                ] : [],
-                ...[
-                  "codex",
-                  "claude",
-                  "xai",
-                  "openai",
-                  "openrouter",
-                  "nous"
-                ].includes(connection.kind) ? [
-                  button("Log in", () => void run(startLogin), auth?.status === "pending")
+                  input("API key / bearer token", key, setKey, "password", () => {
+                    if (!busy && key.trim())
+                      void run(connect);
+                  })
                 ] : [],
-                button("Log out (also dsh-cli)", () => void run(async () => {
-                  await modelsApi({ op: "logout", id: connection.id });
-                  setKey("");
-                  setModels([]);
-                  await load();
-                  setNotice("Signed out");
-                })),
-                button("Refresh models", () => void run(async () => {
-                  await modelsApi({ op: "refresh", id: connection.id });
-                  const next = await load();
-                  await choose(next.connections.find((c) => c.id === connection.id));
-                  setNotice("Models refreshed");
-                })),
+                jsxs("div", {
+                  className: "kiokuko-models-actions",
+                  children: [
+                    button("Save and connect", () => void run(connect)),
+                    ...OAUTH_KINDS.includes(connection.kind) ? [
+                      button("Log in", () => void run(startLogin), auth?.status === "pending")
+                    ] : []
+                  ]
+                }),
+                jsx("p", {
+                  children: connection.kind === "ollama" ? "Ollama needs no key. Save and connect to list its models." : "Paste the API key and press Enter, or use Save and connect. The key is stored with dsh-cli's shared credentials."
+                }),
                 ...auth?.status === "pending" ? [
                   jsxs("div", {
                     "aria-label": "Authentication",
@@ -445,61 +416,156 @@ window.__ModuleLoader__.load({
                     ]
                   })
                 ] : [],
-                ...!["opencode", "opencode-go"].includes(connection.kind) ? [
-                  jsx("details", {
-                    children: jsxs(Fragment, {
-                      children: [
-                        jsx("summary", {
-                          children: "Register model manually"
-                        }),
-                        input("Model ID", manual.id, (value) => setManual({ ...manual, id: value })),
-                        input("Context window", manual.contextWindow, (value) => setManual({
-                          ...manual,
-                          contextWindow: Number(value)
-                        }), "number"),
-                        input("Maximum output tokens", manual.maxTokens, (value) => setManual({
-                          ...manual,
-                          maxTokens: Number(value)
-                        }), "number"),
-                        jsx("label", {
-                          children: jsxs(Fragment, {
+                jsxs("details", {
+                  open: advanced,
+                  children: [
+                    jsx("summary", {
+                      onClick: (e) => {
+                        e.preventDefault();
+                        setAdvanced(!advanced);
+                      },
+                      children: "Advanced settings"
+                    }),
+                    input("Connection name", connection.name, (value) => update("name", value)),
+                    input("Base URL", connection.baseURL, (value) => update("baseURL", value)),
+                    jsx("label", {
+                      children: jsxs(Fragment, {
+                        children: [
+                          "Protocol",
+                          jsx("select", {
+                            "aria-label": "Protocol",
+                            value: connection.protocol,
+                            disabled: busy || [
+                              "codex",
+                              "infron",
+                              "opencode",
+                              "opencode-go"
+                            ].includes(connection.kind),
+                            onChange: (e) => update("protocol", e.target.value),
                             children: [
-                              jsx("input", {
-                                type: "checkbox",
-                                checked: manual.reasoning,
-                                onChange: (e) => setManual({
-                                  ...manual,
-                                  reasoning: e.target.checked
-                                })
-                              }),
-                              "Reasoning supported"
-                            ]
+                              ["chat-completions", "Chat Completions"],
+                              ["responses", "Responses"],
+                              ["messages", "Messages"]
+                            ].map(([id, name]) => jsx("option", { value: id, children: name }, id))
                           })
-                        }),
-                        jsx("label", {
-                          children: jsxs(Fragment, {
-                            children: [
-                              jsx("input", {
-                                type: "checkbox",
-                                checked: manual.image,
-                                onChange: (e) => setManual({
-                                  ...manual,
-                                  image: e.target.checked
+                        ]
+                      })
+                    }),
+                    ...connection.kind === "infron" ? [
+                      jsx("label", {
+                        children: jsxs(Fragment, {
+                          children: [
+                            "Service tier",
+                            jsx("select", {
+                              "aria-label": "Service tier",
+                              value: connection.serviceTier,
+                              disabled: busy,
+                              onChange: (e) => update("serviceTier", e.target.value),
+                              children: [
+                                jsx("option", {
+                                  value: "standard",
+                                  children: "Standard"
+                                }),
+                                jsx("option", {
+                                  value: "flex",
+                                  children: "Flex"
                                 })
-                              }),
-                              "Image input supported"
-                            ]
-                          })
-                        }),
-                        button("Add manual model", () => {
-                          update("models", [
-                            ...connection.models.filter((m) => m.id !== manual.id),
-                            { ...manual, name: manual.id }
-                          ]);
-                          setNotice("Model added to draft. Save connection to register it.");
-                        }, !manual.id)
-                      ]
-                    })
+                              ]
+                            })
+                          ]
+                        })
+                      }),
+                      jsx("p", {
+                        children: "Requested tier: " + connection.serviceTier + ". Last request: " + (connection.lastRequestedTier ?? "none") + ". Actual served tier: " + (connection.actualTier ?? "unknown") + ". Infron may serve Standard for a Flex request."
+                      })
+                    ] : [],
+                    button("Save connection", () => void run(async () => {
+                      await persist();
+                      await reopen();
+                      setNotice("Connection saved");
+                    })),
+                    button("Refresh models", () => void run(async () => {
+                      await persist();
+                      await modelsApi({ op: "refresh", id: connection.id });
+                      const list = await reopen();
+                      setNotice(list.length ? "Models refreshed" : "Models refreshed; none discovered");
+                    })),
+                    button("Log out (also dsh-cli)", () => void run(async () => {
+                      await persist();
+                      await modelsApi({ op: "logout", id: connection.id });
+                      setKey("");
+                      setModels([]);
+                      await load();
+                      setNotice("Signed out");
+                    })),
+                    ...!["opencode", "opencode-go"].includes(connection.kind) ? [
+                      jsx("details", {
+                        open: manualOpen,
+                        children: jsxs(Fragment, {
+                          children: [
+                            jsx("summary", {
+                              onClick: (e) => {
+                                e.preventDefault();
+                                setManualOpen(!manualOpen);
+                              },
+                              children: "Register model manually"
+                            }),
+                            input("Model ID", manual.id, (value) => setManual({ ...manual, id: value })),
+                            input("Context window", manual.contextWindow, (value) => setManual({
+                              ...manual,
+                              contextWindow: Number(value)
+                            }), "number"),
+                            input("Maximum output tokens", manual.maxTokens, (value) => setManual({
+                              ...manual,
+                              maxTokens: Number(value)
+                            }), "number"),
+                            jsx("label", {
+                              children: jsxs(Fragment, {
+                                children: [
+                                  jsx("input", {
+                                    type: "checkbox",
+                                    checked: manual.reasoning,
+                                    onChange: (e) => setManual({
+                                      ...manual,
+                                      reasoning: e.target.checked
+                                    })
+                                  }),
+                                  "Reasoning supported"
+                                ]
+                              })
+                            }),
+                            jsx("label", {
+                              children: jsxs(Fragment, {
+                                children: [
+                                  jsx("input", {
+                                    type: "checkbox",
+                                    checked: manual.image,
+                                    onChange: (e) => setManual({
+                                      ...manual,
+                                      image: e.target.checked
+                                    })
+                                  }),
+                                  "Image input supported"
+                                ]
+                              })
+                            }),
+                            button("Add manual model", () => {
+                              update("models", [
+                                ...connection.models.filter((m) => m.id !== manual.id),
+                                { ...manual, name: manual.id }
+                              ]);
+                              setNotice("Model added to draft. Save connection to register it.");
+                            }, !manual.id)
+                          ]
+                        })
+                      })
+                    ] : []
+                  ]
+                }),
+                jsx("h4", { children: "Models" }),
+                ...models.length === 0 ? [
+                  jsx("p", {
+                    children: "No models yet. Save and connect to discover them, or register one under Advanced settings."
                   })
                 ] : [],
                 input("Search models", filter, setFilter),
@@ -590,7 +656,7 @@ window.__ModuleLoader__.load({
       }, "kiokuko models focus lifecycle");
       ctx.effect(() => {
         const style = document.createElement("style");
-        style.textContent = ".kiokuko-models-modal{width:min(900px,calc(100vw - 32px))}.kiokuko-models-panel{box-sizing:border-box;width:100%;max-width:900px;padding:16px;overflow:auto;max-height:75vh}.kiokuko-models-panel label{display:flex;gap:10px;align-items:center;flex-wrap:wrap;margin:12px 0}.kiokuko-models-panel input,.kiokuko-models-panel select{max-width:100%;box-sizing:border-box;border:1px solid #888;border-radius:6px;padding:8px;color:inherit;background:transparent}.kiokuko-models-panel button{border:1px solid #888;border-radius:6px;padding:8px;margin:4px;color:inherit}.kiokuko-models-panel button:disabled{opacity:.5}.kiokuko-models-panel li{margin:8px 0}.kiokuko-models-panel :focus-visible{outline:2px solid #3286ff;outline-offset:3px}";
+        style.textContent = ".kiokuko-models-modal{width:min(900px,calc(100vw - 32px))}.kiokuko-models-panel{box-sizing:border-box;width:100%;max-width:900px;padding:16px;overflow:auto;max-height:75vh}.kiokuko-models-panel label{display:flex;gap:10px;align-items:center;flex-wrap:wrap;margin:12px 0}.kiokuko-models-panel input,.kiokuko-models-panel select{max-width:100%;box-sizing:border-box;border:1px solid #888;border-radius:6px;padding:8px;color:inherit;background:transparent}.kiokuko-models-panel button{border:1px solid #888;border-radius:6px;padding:8px;margin:4px;color:inherit}.kiokuko-models-panel button:disabled{opacity:.5}.kiokuko-models-panel li{margin:8px 0}.kiokuko-models-panel :focus-visible{outline:2px solid #3286ff;outline-offset:3px}.kiokuko-models-panel summary{cursor:pointer;margin:12px 0}.kiokuko-models-panel h3,.kiokuko-models-panel h4{margin:12px 0 0}.kiokuko-models-state{font-weight:400;font-size:.85em;opacity:.75}.kiokuko-models-actions{display:flex;gap:8px;align-items:center;flex-wrap:wrap}";
         document.head.append(style);
         return () => style.remove();
       }, "kiokuko models style");

package/dist/models-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models-client.d.ts","sourceRoot":"","sources":["../src/models-client.ts"],"names":[],"mappings":"AAAA,UAAU,gBAAgB;IACxB,GAAG,CAAC,CAAC,IAAI,EAAC,MAAM,EAAC,QAAQ,CAAC,EAAC,KAAK,GAAE,OAAO,CAAC;IAC1C,KAAK,EAAE;QACL,MAAM,CAAC,IAAI,EAAC,MAAM,EAAC,QAAQ,EAAC,MAAI,OAAO,GAAE,OAAO,CAAC;QACjD,QAAQ,CAAC,UAAU,EAAC;YAAC,IAAI,EAAC,MAAM,CAAC;YAAA,EAAE,CAAC,EAAC,MAAM,CAAC;YAAA,KAAK,CAAC,EAAC,MAAM,CAAC;YAAA,KAAK,CAAC,EAAC,MAAM,CAAC;YAAA,MAAM,EAAC,MAAM,CAAC;YAAA,MAAM,CAAC,EAAC,MAAI,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,CAAA;SAAC,EAAC,SAAS,EAAC,CAAC,KAAK,EAAC,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,KAAG,OAAO,GAAE,OAAO,CAAC;KACtL,CAAC;IACF,MAAM,EAAC;QAAC,QAAQ,CAAC,SAAS,EAAC,MAAM,EAAC,YAAY,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC,GAAE,OAAO,CAAA;KAAC,CAAC;IAC9F,MAAM,CAAC,KAAK,EAAC,MAAI,IAAI,GAAC,CAAC,MAAI,IAAI,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAC,KAAK,EAAC,MAAM,GAAE,OAAO,CAAC;IACrE,EAAE,CAAC,KAAK,EAAC,kBAAkB,EAAC,QAAQ,EAAC,CAAC,SAAS,EAAC,MAAM,EAAC,IAAI,EAAC,MAAM,EAAC,MAAM,EAAC;QAAC,QAAQ,CAAC,IAAI,EAAC,MAAM,CAAA;KAAC,KAAG,IAAI,GAAE,OAAO,CAAC;CAClH;AA4BD,eAAO,MAAM,MAAM,8BAA+B,CAAC;AACnD,wBAAgB,KAAK,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAEjD;AA8sBD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAqF7D"}
+{"version":3,"file":"models-client.d.ts","sourceRoot":"","sources":["../src/models-client.ts"],"names":[],"mappings":"AAAA,UAAU,gBAAgB;IACxB,GAAG,CAAC,CAAC,IAAI,EAAC,MAAM,EAAC,QAAQ,CAAC,EAAC,KAAK,GAAE,OAAO,CAAC;IAC1C,KAAK,EAAE;QACL,MAAM,CAAC,IAAI,EAAC,MAAM,EAAC,QAAQ,EAAC,MAAI,OAAO,GAAE,OAAO,CAAC;QACjD,QAAQ,CAAC,UAAU,EAAC;YAAC,IAAI,EAAC,MAAM,CAAC;YAAA,EAAE,CAAC,EAAC,MAAM,CAAC;YAAA,KAAK,CAAC,EAAC,MAAM,CAAC;YAAA,KAAK,CAAC,EAAC,MAAM,CAAC;YAAA,MAAM,EAAC,MAAM,CAAC;YAAA,MAAM,CAAC,EAAC,MAAI,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,CAAA;SAAC,EAAC,SAAS,EAAC,CAAC,KAAK,EAAC,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,KAAG,OAAO,GAAE,OAAO,CAAC;KACtL,CAAC;IACF,MAAM,EAAC;QAAC,QAAQ,CAAC,SAAS,EAAC,MAAM,EAAC,YAAY,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC,GAAE,OAAO,CAAA;KAAC,CAAC;IAC9F,MAAM,CAAC,KAAK,EAAC,MAAI,IAAI,GAAC,CAAC,MAAI,IAAI,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAC,KAAK,EAAC,MAAM,GAAE,OAAO,CAAC;IACrE,EAAE,CAAC,KAAK,EAAC,kBAAkB,EAAC,QAAQ,EAAC,CAAC,SAAS,EAAC,MAAM,EAAC,IAAI,EAAC,MAAM,EAAC,MAAM,EAAC;QAAC,QAAQ,CAAC,IAAI,EAAC,MAAM,CAAA;KAAC,KAAG,IAAI,GAAE,OAAO,CAAC;CAClH;AA4BD,eAAO,MAAM,MAAM,8BAA+B,CAAC;AACnD,wBAAgB,KAAK,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAEjD;AAszBD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAqF7D"}