@actalk/inkos-studio 1.3.1 → 1.3.2

package/dist/api/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/api/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EA4BL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAiS5B,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,8EA6wD5E;AAID,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,SAAO,EACX,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAAC,IAAI,CAAC,CA8Cf"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/api/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EA8BL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAwc5B,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,8EA2wD5E;AAID,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,SAAO,EACX,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAAC,IAAI,CAAC,CA8Cf"}

package/dist/api/server.js

@@ -2,7 +2,7 @@ import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { streamSSE } from "hono/streaming";
 import { serve } from "@hono/node-server";
-import { StateManager, PipelineRunner, createLLMClient, createLogger, createInteractionToolsFromDeps, computeAnalytics, loadProjectConfig, loadProjectSession, processProjectInteractionRequest, resolveSessionActiveBook, findOrCreateBookSession, listBookSessions, loadBookSession, persistBookSession, appendBookSessionMessage, runAgentSession, buildAgentSystemPrompt, resolveServicePreset, resolveServiceModel, loadSecrets, saveSecrets, getServiceApiKey, listModelsForService, chatCompletion, GLOBAL_ENV_PATH, } from "@actalk/inkos-core";
+import { StateManager, PipelineRunner, createLLMClient, createLogger, createInteractionToolsFromDeps, computeAnalytics, loadProjectConfig, loadProjectSession, processProjectInteractionRequest, resolveSessionActiveBook, findOrCreateBookSession, listBookSessions, loadBookSession, persistBookSession, appendBookSessionMessage, runAgentSession, buildAgentSystemPrompt, resolveServicePreset, resolveServiceProviderFamily, resolveServiceModelsBaseUrl, resolveServiceModel, loadSecrets, saveSecrets, getServiceApiKey, listModelsForService, chatCompletion, GLOBAL_ENV_PATH, } from "@actalk/inkos-core";
 import { access, readFile, readdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { isSafeBookId } from "./safety.js";
@@ -82,7 +82,7 @@ function normalizeServiceEntry(serviceId, value) {
         return {
             service: "custom",
             name: decodeURIComponent(serviceId.slice("custom:".length)),
-            ...(typeof value.baseUrl === "string" && value.baseUrl.length > 0 ? { baseUrl: normalizeBaseUrl(value.baseUrl) } : {}),
+            ...(typeof value.baseUrl === "string" && value.baseUrl.length > 0 ? { baseUrl: value.baseUrl } : {}),
             ...(typeof value.temperature === "number" ? { temperature: value.temperature } : {}),
             ...(typeof value.maxTokens === "number" ? { maxTokens: value.maxTokens } : {}),
             ...(value.apiFormat === "chat" || value.apiFormat === "responses" ? { apiFormat: value.apiFormat } : {}),
@@ -93,7 +93,7 @@ function normalizeServiceEntry(serviceId, value) {
         return {
             service: "custom",
             ...(typeof value.name === "string" && value.name.length > 0 ? { name: value.name } : {}),
-            ...(typeof value.baseUrl === "string" && value.baseUrl.length > 0 ? { baseUrl: normalizeBaseUrl(value.baseUrl) } : {}),
+            ...(typeof value.baseUrl === "string" && value.baseUrl.length > 0 ? { baseUrl: value.baseUrl } : {}),
             ...(typeof value.temperature === "number" ? { temperature: value.temperature } : {}),
             ...(typeof value.maxTokens === "number" ? { maxTokens: value.maxTokens } : {}),
             ...(value.apiFormat === "chat" || value.apiFormat === "responses" ? { apiFormat: value.apiFormat } : {}),
@@ -111,30 +111,19 @@ function normalizeServiceEntry(serviceId, value) {
 function normalizeConfigSource(value) {
     return value === "studio" ? "studio" : "env";
 }
-/** Ensure custom baseUrl ends with /v1 (common convention for OpenAI-compatible APIs). */
-function normalizeBaseUrl(url) {
-    const trimmed = url.replace(/\/+$/, "");
-    if (/\/v\d+$/.test(trimmed))
-        return trimmed;
-    return trimmed + "/v1";
-}
 function normalizeServiceConfig(raw) {
     if (Array.isArray(raw)) {
         return raw
             .filter((entry) => Boolean(entry) && typeof entry === "object")
-            .map((entry) => {
-            const svc = typeof entry.service === "string" && entry.service.length > 0 ? entry.service : "custom";
-            const isCustom = svc === "custom";
-            return {
-                service: svc,
-                ...(typeof entry.name === "string" && entry.name.length > 0 ? { name: entry.name } : {}),
-                ...(typeof entry.baseUrl === "string" && entry.baseUrl.length > 0 ? { baseUrl: isCustom ? normalizeBaseUrl(entry.baseUrl) : entry.baseUrl } : {}),
-                ...(typeof entry.temperature === "number" ? { temperature: entry.temperature } : {}),
-                ...(typeof entry.maxTokens === "number" ? { maxTokens: entry.maxTokens } : {}),
-                ...(entry.apiFormat === "chat" || entry.apiFormat === "responses" ? { apiFormat: entry.apiFormat } : {}),
-                ...(typeof entry.stream === "boolean" ? { stream: entry.stream } : {}),
-            };
-        });
+            .map((entry) => ({
+            service: typeof entry.service === "string" && entry.service.length > 0 ? entry.service : "custom",
+            ...(typeof entry.name === "string" && entry.name.length > 0 ? { name: entry.name } : {}),
+            ...(typeof entry.baseUrl === "string" && entry.baseUrl.length > 0 ? { baseUrl: entry.baseUrl } : {}),
+            ...(typeof entry.temperature === "number" ? { temperature: entry.temperature } : {}),
+            ...(typeof entry.maxTokens === "number" ? { maxTokens: entry.maxTokens } : {}),
+            ...(entry.apiFormat === "chat" || entry.apiFormat === "responses" ? { apiFormat: entry.apiFormat } : {}),
+            ...(typeof entry.stream === "boolean" ? { stream: entry.stream } : {}),
+        }));
     }
     if (raw && typeof raw === "object") {
         return Object.entries(raw)
@@ -206,7 +195,7 @@ async function readEnvConfigStatus(root) {
 }
 async function resolveConfiguredServiceBaseUrl(root, serviceId, inlineBaseUrl) {
     if (inlineBaseUrl?.trim())
-        return isCustomServiceId(serviceId) ? normalizeBaseUrl(inlineBaseUrl.trim()) : inlineBaseUrl.trim();
+        return inlineBaseUrl.trim();
     if (!isCustomServiceId(serviceId)) {
         return resolveServicePreset(serviceId)?.baseUrl;
     }
@@ -230,6 +219,146 @@ async function resolveConfiguredServiceEntry(root, serviceId) {
         return undefined;
     }
 }
+function buildProbePlans(preferredApiFormat, preferredStream) {
+    const candidates = [];
+    const seen = new Set();
+    const push = (apiFormat, stream) => {
+        const key = `${apiFormat}:${stream ? "1" : "0"}`;
+        if (seen.has(key))
+            return;
+        seen.add(key);
+        candidates.push({ apiFormat, stream });
+    };
+    if (preferredApiFormat) {
+        push(preferredApiFormat, preferredStream ?? false);
+        push(preferredApiFormat, !(preferredStream ?? false));
+    }
+    const alternate = preferredApiFormat === "responses" ? "chat" : "responses";
+    push(alternate, false);
+    push(alternate, true);
+    push("chat", false);
+    push("chat", true);
+    push("responses", false);
+    push("responses", true);
+    return candidates;
+}
+function buildModelCandidates(args) {
+    const seen = new Set();
+    const candidates = [];
+    const push = (value) => {
+        if (!value || value.trim().length === 0)
+            return;
+        const id = value.trim();
+        if (seen.has(id))
+            return;
+        seen.add(id);
+        candidates.push(id);
+    };
+    push(args.preferredModel);
+    push(args.configModel);
+    push(args.envModel ?? undefined);
+    for (const model of args.discoveredModels)
+        push(model.id);
+    push("gpt-5.4");
+    push("gpt-4o");
+    push("claude-sonnet-4-6");
+    push("MiniMax-M2.7");
+    push("kimi-k2.5");
+    return candidates;
+}
+async function fetchModelsFromServiceBaseUrl(serviceId, baseUrl, apiKey) {
+    const modelsBaseUrl = isCustomServiceId(serviceId)
+        ? baseUrl
+        : resolveServiceModelsBaseUrl(serviceId) ?? baseUrl;
+    const modelsUrl = modelsBaseUrl.replace(/\/$/, "") + "/models";
+    try {
+        const res = await fetch(modelsUrl, {
+            headers: { Authorization: `Bearer ${apiKey}` },
+            signal: AbortSignal.timeout(10_000),
+        });
+        if (!res.ok) {
+            const body = await res.text().catch(() => "");
+            return { models: [], error: `服务商返回 ${res.status}: ${body.slice(0, 200)}` };
+        }
+        const json = await res.json();
+        return {
+            models: (json.data ?? []).map((m) => ({ id: m.id, name: m.id })),
+        };
+    }
+    catch (error) {
+        return {
+            models: [],
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+async function probeServiceCapabilities(args) {
+    const rawConfig = await loadRawConfig(args.root).catch(() => ({}));
+    const llm = rawConfig.llm ?? {};
+    const envConfig = await readEnvConfigStatus(args.root);
+    const envModel = envConfig.effectiveSource === "project"
+        ? envConfig.project.model
+        : envConfig.effectiveSource === "global"
+            ? envConfig.global.model
+            : null;
+    const baseService = isCustomServiceId(args.service) ? "custom" : args.service;
+    const modelsResponse = await fetchModelsFromServiceBaseUrl(baseService, args.baseUrl, args.apiKey);
+    const discoveredModels = modelsResponse.models;
+    const modelCandidates = buildModelCandidates({
+        preferredModel: args.preferredModel,
+        configModel: typeof llm.defaultModel === "string" ? llm.defaultModel : typeof llm.model === "string" ? llm.model : undefined,
+        envModel,
+        discoveredModels,
+    });
+    if (modelCandidates.length === 0) {
+        return {
+            ok: false,
+            models: [],
+            error: "无法自动确定模型，请先填写可用模型或提供支持 /models 的服务端点。",
+        };
+    }
+    let lastError = modelsResponse.error ?? "自动探测失败";
+    for (const model of modelCandidates) {
+        for (const plan of buildProbePlans(args.preferredApiFormat, args.preferredStream)) {
+            const client = createLLMClient({
+                provider: resolveServiceProviderFamily(baseService) ?? "openai",
+                service: baseService,
+                configSource: "studio",
+                baseUrl: args.baseUrl,
+                apiKey: args.apiKey.trim(),
+                model,
+                temperature: 0.7,
+                maxTokens: 64,
+                thinkingBudget: 0,
+                apiFormat: plan.apiFormat,
+                stream: plan.stream,
+            });
+            try {
+                await chatCompletion(client, model, [{ role: "user", content: "ping" }], { maxTokens: 5 });
+                const models = discoveredModels.length > 0
+                    ? discoveredModels
+                    : [{ id: model, name: model }];
+                return {
+                    ok: true,
+                    models,
+                    selectedModel: model,
+                    apiFormat: plan.apiFormat,
+                    stream: plan.stream,
+                    baseUrl: args.baseUrl,
+                    modelsSource: discoveredModels.length > 0 ? "api" : "fallback",
+                };
+            }
+            catch (error) {
+                lastError = error instanceof Error ? error.message : String(error);
+            }
+        }
+    }
+    return {
+        ok: false,
+        models: discoveredModels,
+        error: lastError,
+    };
+}
 // --- Server factory ---
 export function createStudioServer(initialConfig, root) {
     const app = new Hono();
@@ -606,6 +735,9 @@ export function createStudioServer(initialConfig, root) {
         if (body.configSource !== undefined) {
             llm.configSource = normalizeConfigSource(body.configSource);
         }
+        if (body.service !== undefined) {
+            llm.service = body.service;
+        }
         await saveRawConfig(root, config);
         return c.json({ ok: true });
     });
@@ -619,37 +751,29 @@ export function createStudioServer(initialConfig, root) {
         if (!resolvedBaseUrl) {
             return c.json({ ok: false, error: `未知服务商: ${service}` }, 400);
         }
-        // Try /models API — validates key + discovers models in one call
-        const modelsUrl = resolvedBaseUrl.replace(/\/$/, "") + "/models";
-        let models = [];
-        try {
-            const res = await fetch(modelsUrl, {
-                headers: { Authorization: `Bearer ${apiKey.trim()}` },
-                signal: AbortSignal.timeout(10_000),
-            });
-            if (res.status === 401 || res.status === 403) {
-                return c.json({ ok: false, error: "API Key 无效，请检查后重试" }, 400);
-            }
-            if (res.ok) {
-                const json = await res.json();
-                models = (json.data ?? []).map((m) => ({ id: m.id, name: m.id }));
-            }
-        }
-        catch (err) {
-            if (err?.name === "TimeoutError" || err?.name === "AbortError") {
-                return c.json({ ok: false, error: `连接超时：无法访问 ${modelsUrl}` }, 400);
-            }
-            // Network error — continue to fallback
-        }
-        // /models unavailable (404 etc.) — fallback to pi-ai built-in model list
-        if (models.length === 0) {
-            const builtIn = await listModelsForService(service);
-            models = builtIn.map((m) => ({ id: m.id, name: m.name }));
-        }
-        if (models.length === 0) {
-            return c.json({ ok: false, error: "未找到可用模型" }, 400);
+        const probe = await probeServiceCapabilities({
+            root,
+            service,
+            apiKey: apiKey.trim(),
+            baseUrl: resolvedBaseUrl,
+            preferredApiFormat: apiFormat,
+            preferredStream: stream,
+        });
+        if (!probe.ok) {
+            return c.json({ ok: false, error: probe.error ?? "连接失败" }, 400);
         }
-        return c.json({ ok: true, modelCount: models.length, models: models.slice(0, 50) });
+        return c.json({
+            ok: true,
+            modelCount: probe.models.length,
+            models: probe.models.slice(0, 50),
+            selectedModel: probe.selectedModel,
+            detected: {
+                apiFormat: probe.apiFormat,
+                stream: probe.stream,
+                baseUrl: probe.baseUrl,
+                modelsSource: probe.modelsSource,
+            },
+        });
     });
     app.put("/api/v1/services/:service/secret", async (c) => {
         const service = c.req.param("service");
@@ -680,25 +804,22 @@ export function createStudioServer(initialConfig, root) {
         const resolvedBaseUrl = await resolveConfiguredServiceBaseUrl(root, service);
         if (!resolvedBaseUrl)
             return c.json({ models: [] });
-        // Call real /models API, fallback to pi-ai built-in list
-        let models = [];
-        try {
-            const modelsUrl = resolvedBaseUrl.replace(/\/$/, "") + "/models";
-            const res = await fetch(modelsUrl, {
-                headers: { Authorization: `Bearer ${apiKey}` },
-                signal: AbortSignal.timeout(10_000),
-            });
-            if (res.ok) {
-                const json = await res.json();
-                models = (json.data ?? []).map((m) => ({ id: m.id, name: m.id }));
-            }
-        }
-        catch { /* timeout or network error */ }
-        if (models.length === 0) {
-            const builtIn = await listModelsForService(service, apiKey);
-            models = builtIn.map((m) => ({ id: m.id, name: m.name }));
-        }
-        return c.json({ models });
+        const rawConfig = await loadRawConfig(root).catch(() => ({}));
+        const llm = rawConfig.llm ?? {};
+        const preferredModel = typeof llm.defaultModel === "string" ? llm.defaultModel : undefined;
+        const serviceEntry = await resolveConfiguredServiceEntry(root, service);
+        const probe = await probeServiceCapabilities({
+            root,
+            service,
+            apiKey,
+            baseUrl: resolvedBaseUrl,
+            preferredApiFormat: serviceEntry?.apiFormat,
+            preferredStream: serviceEntry?.stream,
+            preferredModel,
+        });
+        return c.json({
+            models: probe.ok ? probe.models : [],
+        });
     });
     // --- Project info ---
     app.get("/api/v1/project", async (c) => {
@@ -1775,10 +1896,17 @@ export function createStudioServer(initialConfig, root) {
         catch { /* ignore */ }
         try {
             const currentConfig = await loadCurrentProjectConfig({ requireApiKey: false });
-            const client = createLLMClient(currentConfig.llm);
-            const { chatCompletion } = await import("@actalk/inkos-core");
-            await chatCompletion(client, currentConfig.llm.model, [{ role: "user", content: "ping" }], { maxTokens: 5 });
-            checks.llmConnected = true;
+            const service = currentConfig.llm.service ?? currentConfig.llm.provider;
+            const probe = await probeServiceCapabilities({
+                root,
+                service,
+                apiKey: currentConfig.llm.apiKey,
+                baseUrl: currentConfig.llm.baseUrl,
+                preferredApiFormat: currentConfig.llm.apiFormat,
+                preferredStream: currentConfig.llm.stream,
+                preferredModel: currentConfig.llm.model,
+            });
+            checks.llmConnected = probe.ok;
         }
         catch { /* ignore */ }
         return c.json(checks);