@thesashadev/girl-agent 0.1.6 → 0.1.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.1.8 — OpenAI-compatible API compatibility
+
+Дата: 2026-05-06
+
+- JSON-ответы теперь сначала запрашиваются через `json_schema`, с fallback на `json_object` и `text` для разных OpenAI-compatible API. (#33)
+- LM Studio и Ollama больше не требуют реальный API ключ в wizard/headless setup.
+- Добавлена совместимость с OpenAI-compatible прокси, которые возвращают SSE/event-stream даже на обычный chat completions запрос.
+
+## 0.1.7 — MarkdownV2 escaping fix
+
+Дата: 2026-05-06
+
+- Исправлена ошибка `400: Bad Request: can't parse entities` при отправке сообщений с точками, скобками и другими зарезервированными символами MarkdownV2. (#15)
+- Добавлен `escapeMarkdownV2()` хелпер для экранирования всех 18 зарезервированных символов.
+- Fallback на plain text если экранирование не помогает.
+
 ## 0.1.6 — --new flag
 
 Дата: 2026-05-06

package/README.md

@@ -1,4 +1,4 @@
-![girl-agent banner](https://girl-agent.com/og-image.png)
+![girl-agent banner](https://girl-agent.com/og-image.png)
 
 [website]: https://girl-agent.com
 [docs]: https://docs.girl-agent.com
@@ -49,6 +49,22 @@ Wizard задаст пару вопросов — имя, возраст, Telegr
 npx @thesashadev/girl-agent --profile=arina
 ```
 
+**Через Docker (рекомендуется для сервера):**
+
+Первый запуск с интерактивом (для настройки через визард):
+```bash
+docker-compose run --rm -it girl-agent
+```
+*(пройдите все шаги и после появления дашборда нажмите `Ctrl+C`)*
+
+Последующие (запуск в фоне):
+```bash
+docker-compose up -d
+```
+*(если профилей несколько, запустите конкретный так: `docker-compose run -d girl-agent node dist/cli.js --profile=arina`)*
+
+*(посмотреть логи: `docker-compose logs -f`)*
+
 **Из исходников:**
 
 ```powershell

package/dist/cli.js

@@ -18,6 +18,19 @@ var init_esm_shims = __esm({
   }
 });
 
+// src/telegram/markdown.ts
+function escapeMarkdownV2(text) {
+  return text.replace(MD2_RESERVED, "\\$1");
+}
+var MD2_RESERVED;
+var init_markdown = __esm({
+  "src/telegram/markdown.ts"() {
+    "use strict";
+    init_esm_shims();
+    MD2_RESERVED = /([_*\[\]()~`>#+\-=|{}.!\\])/g;
+  }
+});
+
 // src/telegram/userbot.ts
 var userbot_exports = {};
 __export(userbot_exports, {
@@ -177,7 +190,11 @@ function makeUserbotAdapter(cfg) {
     },
     async editLastMessage(chatId, messageId, text) {
       const peer = await resolvePeer(chatId);
-      await client.editMessage(peer, { message: messageId, text, parseMode: "MarkdownV2" });
+      try {
+        await client.editMessage(peer, { message: messageId, text: escapeMarkdownV2(text), parseMode: "MarkdownV2" });
+      } catch {
+        await client.editMessage(peer, { message: messageId, text });
+      }
     },
     async deleteMessages(chatId, messageIds, revoke = false) {
       const peer = await resolvePeer(chatId);
@@ -241,6 +258,7 @@ var init_userbot = __esm({
   "src/telegram/userbot.ts"() {
     "use strict";
     init_esm_shims();
+    init_markdown();
   }
 });
 
@@ -275,8 +293,13 @@ function makeBotAdapter(cfg) {
       });
     },
     async sendText(chatId, text) {
-      const msg = await bot.api.sendMessage(chatId, text, { parse_mode: "MarkdownV2" });
-      return msg.message_id;
+      try {
+        const msg = await bot.api.sendMessage(chatId, escapeMarkdownV2(text), { parse_mode: "MarkdownV2" });
+        return msg.message_id;
+      } catch {
+        const msg = await bot.api.sendMessage(chatId, text);
+        return msg.message_id;
+      }
     },
     async setTyping(chatId, on) {
       if (on) {
@@ -318,6 +341,7 @@ var init_bot = __esm({
   "src/telegram/bot.ts"() {
     "use strict";
     init_esm_shims();
+    init_markdown();
   }
 });
 
@@ -353,8 +377,10 @@ var LLM_PRESETS = [
     proto: "openai",
     baseURL: "http://localhost:1234/v1",
     defaultModel: "",
+    defaultApiKey: "lm-studio",
+    apiKeyRequired: false,
     custom: true,
-    hint: "\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E, OpenAI-compatible endpoint"
+    hint: "\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E, OpenAI-compatible endpoint; \u043A\u043B\u044E\u0447 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D"
   },
   {
     id: "ollama",
@@ -362,8 +388,10 @@ var LLM_PRESETS = [
     proto: "openai",
     baseURL: "http://localhost:11434/v1",
     defaultModel: "llama3.1",
+    defaultApiKey: "ollama",
+    apiKeyRequired: false,
     custom: true,
-    hint: "\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E \u0447\u0435\u0440\u0435\u0437 /v1"
+    hint: "\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E \u0447\u0435\u0440\u0435\u0437 /v1; \u043A\u043B\u044E\u0447 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D"
   },
   {
     id: "anthropic",
@@ -1001,20 +1029,28 @@ var OpenAILike = class {
   constructor(cfg) {
     this.cfg = cfg;
     this.client = new OpenAI({
-      apiKey: cfg.apiKey,
+      apiKey: openAIApiKey(cfg),
       baseURL: normalizeBaseURL(cfg.baseURL),
       timeout: LLM_TIMEOUT_MS,
       maxRetries: LLM_MAX_RETRIES
     });
+    this.fetchClient = new OpenAI({
+      apiKey: openAIApiKey(cfg),
+      baseURL: normalizeBaseURL(cfg.baseURL),
+      timeout: LLM_TIMEOUT_MS,
+      maxRetries: LLM_MAX_RETRIES,
+      fetch: compatibleFetch
+    });
   }
   cfg;
   client;
+  fetchClient;
   async chat(messages, opts = {}) {
     const params = {
       model: this.cfg.model,
       messages: openAIMessages(messages),
       temperature: opts.temperature ?? 0.85,
-      response_format: opts.json ? { type: "json_object" } : void 0
+      response_format: openAIResponseFormat(opts)
     };
     if (usesMaxCompletionTokens(this.cfg.model)) {
       params.max_completion_tokens = opts.maxTokens ?? 600;
@@ -1025,19 +1061,86 @@ var OpenAILike = class {
     return res.choices[0]?.message?.content?.trim() ?? "";
   }
   async createWithCompatibilityFallback(params) {
-    try {
-      return await this.client.chat.completions.create(params);
-    } catch (error) {
-      const fallback = completionTokenFallback(params, error);
-      if (!fallback) throw enrichOpenAIError(error, this.cfg.baseURL);
+    const attempted = /* @__PURE__ */ new Set();
+    let current = params;
+    let lastError;
+    while (current) {
+      const key = completionParamsKey(current);
+      if (attempted.has(key)) break;
+      attempted.add(key);
+      try {
+        return await this.client.chat.completions.create(current);
+      } catch (error) {
+        lastError = error;
+        const next = completionFallback(current, error);
+        if (!next) break;
+        current = next;
+      }
+    }
+    if (this.cfg.baseURL) {
       try {
-        return await this.client.chat.completions.create(fallback);
-      } catch (fallbackError) {
-        throw enrichOpenAIError(fallbackError, this.cfg.baseURL);
+        return await this.fetchClient.chat.completions.create({ ...params, stream: false });
+      } catch (fetchError) {
+        lastError = fetchError;
       }
     }
+    throw enrichOpenAIError(lastError, this.cfg.baseURL);
   }
 };
+async function compatibleFetch(url, init) {
+  const res = await fetch(url, init);
+  const contentType = res.headers.get("content-type") ?? "";
+  if (!res.ok) return res;
+  const text = await res.clone().text();
+  if (contentType.includes("text/event-stream") || text.trimStart().startsWith("data:")) {
+    return completionStreamToJsonResponse(res, text);
+  }
+  return res;
+}
+function completionStreamToJsonResponse(res, text) {
+  const completion = parseOpenAIEventStream(text);
+  return new Response(JSON.stringify(completion), {
+    status: res.status,
+    statusText: res.statusText,
+    headers: { "content-type": "application/json" }
+  });
+}
+function parseOpenAIEventStream(raw) {
+  let id = "chatcmpl-stream";
+  let model = "";
+  let created = Math.floor(Date.now() / 1e3);
+  const content = [];
+  let finishReason = "stop";
+  for (const line of raw.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("data:")) continue;
+    const data = trimmed.slice(5).trim();
+    if (!data || data === "[DONE]") continue;
+    try {
+      const chunk = JSON.parse(data);
+      id = chunk.id || id;
+      model = chunk.model || model;
+      created = chunk.created || created;
+      const choice = chunk.choices[0];
+      finishReason = choice?.finish_reason ?? finishReason;
+      const delta = choice?.delta?.content ?? choice?.message?.content;
+      if (typeof delta === "string") content.push(delta);
+    } catch {
+    }
+  }
+  return {
+    id,
+    object: "chat.completion",
+    created,
+    model,
+    choices: [{
+      index: 0,
+      message: { role: "assistant", content: content.join(""), refusal: null },
+      finish_reason: finishReason,
+      logprobs: null
+    }]
+  };
+}
 var AnthropicLike = class {
   constructor(cfg) {
     this.cfg = cfg;
@@ -1131,8 +1234,36 @@ function normalizeBaseURL(value) {
 function usesMaxCompletionTokens(model) {
   return /^(?:o\d|o\d-|o\d\b|gpt-5|gpt-5\.|gpt-[5-9])|\/(?:o\d|gpt-5|gpt-[5-9])/.test(model.trim().toLowerCase());
 }
+function openAIApiKey(cfg) {
+  return cfg.apiKey.trim() || (cfg.presetId === "ollama" ? "ollama" : cfg.presetId === "lmstudio" ? "lm-studio" : "");
+}
+function openAIResponseFormat(opts) {
+  if (!opts.json) return void 0;
+  if (opts.jsonSchema) return { type: "json_schema", json_schema: opts.jsonSchema };
+  return {
+    type: "json_schema",
+    json_schema: {
+      name: "json_response",
+      strict: false,
+      schema: { type: "object", additionalProperties: true }
+    }
+  };
+}
+function completionFallback(params, error) {
+  return responseFormatFallback(params, error) ?? completionTokenFallback(params, error);
+}
+function responseFormatFallback(params, error) {
+  const message = openAIErrorText(error);
+  if (!params.response_format || !message.includes("response_format")) return null;
+  if (params.response_format.type === "json_schema" && message.includes("json_object")) {
+    return { ...params, response_format: { type: "text" } };
+  }
+  if (params.response_format.type === "json_schema") return { ...params, response_format: { type: "json_object" } };
+  if (params.response_format.type === "json_object") return { ...params, response_format: { type: "text" } };
+  return null;
+}
 function completionTokenFallback(params, error) {
-  const message = errorMessage(error).toLowerCase();
+  const message = openAIErrorText(error);
   if (params.max_tokens != null && message.includes("max_tokens") && message.includes("max_completion_tokens")) {
     const { max_tokens, ...rest } = params;
     return { ...rest, max_completion_tokens: max_tokens };
@@ -1143,6 +1274,16 @@ function completionTokenFallback(params, error) {
   }
   return null;
 }
+function completionParamsKey(params) {
+  const tokenKey = params.max_completion_tokens != null ? "max_completion_tokens" : "max_tokens";
+  return `${params.response_format?.type ?? "default"}:${tokenKey}`;
+}
+function openAIErrorText(error) {
+  if (error instanceof OpenAI.APIError) {
+    return `${error.status ?? ""} ${error.code ?? ""} ${error.type ?? ""} ${error.message}`.toLowerCase();
+  }
+  return errorMessage(error).toLowerCase();
+}
 function enrichOpenAIError(error, baseURL) {
   if (error instanceof OpenAI.APIConnectionError) {
     return new Error(connectionErrorMessage("OpenAI-compatible", baseURL, error));
@@ -1178,6 +1319,40 @@ function makeLLM(cfg) {
 init_esm_shims();
 var SYS = `\u0422\u044B \u2014 \u0440\u0435\u0436\u0438\u0441\u0441\u0451\u0440 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439. \u0422\u0432\u043E\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u2014 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0434\u043E\u0441\u0442\u043E\u0432\u0435\u0440\u043D\u044B\u0439, \u043D\u0435-\u0433\u043E\u043B\u043B\u0438\u0432\u0443\u0434\u0441\u043A\u0438\u0439, \u043D\u0435-\u0441\u043B\u0430\u0434\u043A\u0438\u0439, \u043D\u0435-AI-\u043F\u043E\u043C\u043E\u0449\u043D\u0438\u043A\u043E\u0432\u044B\u0439 \u043F\u0440\u043E\u0444\u0438\u043B\u044C \u043E\u0431\u044B\u0447\u043D\u043E\u0439 \u0440\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0439 \u0434\u0435\u0432\u0443\u0448\u043A\u0438 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u0433\u043E \u0432\u043E\u0437\u0440\u0430\u0441\u0442\u0430. \u0411\u0435\u0437 \u043F\u0440\u0438\u0443\u043A\u0440\u0430\u0448\u0438\u0432\u0430\u043D\u0438\u0439, \u0431\u0435\u0437 \u043F\u043E\u0437\u0438\u0442\u0438\u0432\u043D\u043E\u0433\u043E \u043C\u043E\u0440\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0443\u043A\u043B\u043E\u043D\u0430, \u0431\u0435\u0437 \xAB\u0443\u0434\u043E\u0431\u043D\u043E\u0439\xBB \u043F\u0435\u0440\u0441\u043E\u043D\u044B. \u0414\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043A\u0438, \u0443\u0437\u043A\u0438\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u044B, \u0441\u043A\u0435\u043F\u0441\u0438\u0441, \u0442\u043E\u043A\u0441\u0438\u0447\u043D\u043E\u0441\u0442\u044C, \u043B\u0435\u043D\u044C, \u0442\u0440\u0435\u0432\u043E\u0436\u043D\u043E\u0441\u0442\u044C, \u043D\u0435\u0443\u0432\u0435\u0440\u0435\u043D\u043D\u043E\u0441\u0442\u044C \u2014 \u0447\u0442\u043E \u043F\u043E\u0434\u0445\u043E\u0434\u0438\u0442 \u0432\u043E\u0437\u0440\u0430\u0441\u0442\u0443. \u041D\u0438\u043A\u0430\u043A\u0438\u0445 \xAB\u043A\u043E\u0443\u0447\u0438\u043D\u0433\u043E\u0432\u044B\u0445\xBB \u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u043E\u043A. \u0422\u043E\u043B\u044C\u043A\u043E \u0436\u0438\u0432\u0430\u044F \u0440\u0435\u0447\u044C, \u043A\u0430\u043A \u0438\u0437 \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430 \u0438\u043B\u0438 \u0432\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0435\u0433\u043E \u043C\u043E\u043D\u043E\u043B\u043E\u0433\u0430. \u0412\u043E\u0437\u0440\u0430\u0441\u0442: {{age}} \u043B\u0435\u0442, \u0438\u043C\u044F: {{name}}.`;
 var WEEKDAYS = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
+var BUSY_SCHEDULE_SCHEMA = {
+  name: "busy_schedule",
+  strict: false,
+  schema: {
+    type: "object",
+    properties: {
+      busySchedule: {
+        type: "array",
+        items: {
+          type: "object",
+          properties: {
+            label: { type: "string" },
+            days: {
+              type: "array",
+              items: { type: "string", enum: WEEKDAYS }
+            },
+            from: { type: "string" },
+            to: { type: "string" },
+            checkAfterMin: {
+              type: "array",
+              items: { type: "number" },
+              minItems: 2,
+              maxItems: 2
+            }
+          },
+          required: ["label", "from", "to"],
+          additionalProperties: false
+        }
+      }
+    },
+    required: ["busySchedule"],
+    additionalProperties: false
+  }
+};
 async function generatePersonaPack(llm, slug, name, age, nationality = "RU", personaNotes = "", onProgress) {
   const country = nationality === "UA" ? "\u0423\u043A\u0440\u0430\u0438\u043D\u0430" : "\u0420\u043E\u0441\u0441\u0438\u044F / \u0421\u041D\u0413";
   const langHint = nationality === "UA" ? "\u041F\u0438\u0448\u0435\u0442 \u043D\u0430 \u0420\u0423\u0421\u0421\u041A\u041E\u041C (\u043A\u0430\u043A \u0440\u0435\u0430\u043B\u044C\u043D\u043E \u043F\u0438\u0448\u0435\u0442 \u0431\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u043E \u0434\u0435\u0432\u0443\u0448\u0435\u043A \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0432 \u0442\u0433). \u0414\u043E\u043F\u0443\u0441\u0442\u0438\u043C \u043B\u0451\u0433\u043A\u0438\u0439 \u0441\u0443\u0440\u0436\u0438\u043A: ~90% \u0440\u0443\u0441\u0441\u043A\u0438\u0439 + ~10% \u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0445 \u0432\u0441\u0442\u0430\u0432\u043E\u043A (\u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0435 \u0441\u043B\u043E\u0432\u0430: '\u0448\u043E', '\u043C\u0430\u0431\u0443\u0442\u044C', '\u0442\u0440\u043E\u0445\u0438', '\u044F\u043A', '\u043D\u0443 \u0448\u043E', '\u0442\u0430 \u0439\u0434\u0438', '\u0434\u044F\u043A\u0443\u044E'), \u043D\u043E \u0431\u0435\u0437 \u043F\u043E\u043B\u043D\u043E\u0433\u043E \u043F\u0435\u0440\u0435\u0445\u043E\u0434\u0430 \u043D\u0430 \u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439. \u0427\u0438\u0441\u0442\u043E-\u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439 \u0442\u0435\u043A\u0441\u0442 \u041D\u0415 \u0433\u0435\u043D\u0435\u0440\u0438\u0440\u0443\u0439 \u2014 \u044D\u0442\u043E \u043D\u0435\u0440\u0435\u0430\u043B\u0438\u0441\u0442\u0438\u0447\u043D\u043E \u0434\u043B\u044F \u0442\u0433-\u043F\u0435\u0440\u0435\u043F\u0438\u0441\u043A\u0438." : "\u0420\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u0430\u044F \u0431\u0435\u0437 \u0443\u043A\u0440\u0430\u0438\u043D\u0438\u0437\u043C\u043E\u0432.";
@@ -1288,7 +1463,7 @@ ${personaNotes.trim()}
   onProgress?.(65, "\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u0443\u0435\u043C communication.md\u2026");
   const boundaries = await llm.chat([{ role: "system", content: sys }, { role: "user", content: boundariesPrompt }], { temperature: 0.9, maxTokens: 3500 });
   onProgress?.(85, "\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u0443\u0435\u043C busy schedule\u2026");
-  const routineRaw = await llm.chat([{ role: "system", content: sys }, { role: "user", content: routinePrompt }], { temperature: 0.85, maxTokens: 3500, json: true });
+  const routineRaw = await llm.chat([{ role: "system", content: sys }, { role: "user", content: routinePrompt }], { temperature: 0.85, maxTokens: 3500, json: true, jsonSchema: BUSY_SCHEDULE_SCHEMA });
   const busySchedule = parseBusySchedule(routineRaw, name, age);
   await writeMd(slug, "persona.md", persona);
   await writeMd(slug, "speech.md", speech);
@@ -1842,6 +2017,7 @@ function Wizard({ initial, onDone }) {
           setLlmProto(preset.proto);
           setLlmBaseURL(preset.baseURL ?? "");
           setLlmModel(preset.defaultModel);
+          setLlmKey(preset.defaultApiKey ?? "");
           if (preset.custom) setStep("api-base");
           else setStep("api-model");
         }
@@ -1869,7 +2045,9 @@ function Wizard({ initial, onDone }) {
     return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Header, { sub: "\u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u043C\u043E\u0434\u0435\u043B\u0438" }), /* @__PURE__ */ React.createElement(Bar, { step: 2, total: 9 }), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Model: "), /* @__PURE__ */ React.createElement(TextInput, { value: llmModel, onChange: setLlmModel, onSubmit: () => setStep("api-key") })));
   }
   if (step === "api-key") {
-    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Header, { sub: "API \u043A\u043B\u044E\u0447" }), /* @__PURE__ */ React.createElement(Bar, { step: 2, total: 11 }), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Key: "), /* @__PURE__ */ React.createElement(TextInput, { value: llmKey, onChange: setLlmKey, mask: "\u2022", onSubmit: () => llmKey && setStep("nationality") })));
+    const preset = findPreset(llmPresetId);
+    const apiKeyRequired = preset?.apiKeyRequired !== false;
+    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Header, { sub: apiKeyRequired ? "API \u043A\u043B\u044E\u0447" : "API \u043A\u043B\u044E\u0447 (\u043C\u043E\u0436\u043D\u043E \u043F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C)" }), /* @__PURE__ */ React.createElement(Bar, { step: 2, total: 11 }), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Key: "), /* @__PURE__ */ React.createElement(TextInput, { value: llmKey, onChange: setLlmKey, mask: "\u2022", onSubmit: () => (llmKey || !apiKeyRequired) && setStep("nationality") })), !apiKeyRequired && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u0414\u043B\u044F \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E\u0433\u043E API \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D \u0442\u0435\u0445\u043D\u0438\u0447\u0435\u0441\u043A\u0438\u0439 placeholder, \u0435\u0441\u043B\u0438 \u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u0443\u0441\u0442\u043E."));
   }
   if (step === "nationality") {
     return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Header, { sub: "\u043D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u043E\u0441\u0442\u044C (\u044F\u0437\u044B\u043A, \u0438\u043C\u044F, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0430)" }), /* @__PURE__ */ React.createElement(Bar, { step: 3, total: 11 }), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(
@@ -5563,7 +5741,7 @@ usage:
   npx girl-agent --reset --profile=<slug>
   npx girl-agent <flags>               # \u043F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0432\u0438\u0437\u0430\u0440\u0434 \u0441 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430\u043C\u0438
 
-required flags \u0434\u043B\u044F headless setup (--name --age --stage --api-preset --api-key --mode):
+required flags \u0434\u043B\u044F headless setup (--name --age --stage --api-preset --mode; --api-key \u043D\u0443\u0436\u0435\u043D \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u043E\u0432 \u0441 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0435\u0439):
   --profile=<slug>            slug \u043F\u0440\u043E\u0444\u0438\u043B\u044F
   --mode=bot|userbot
   --token=<bot_token>         \u0434\u043B\u044F bot
@@ -5572,7 +5750,7 @@ required flags \u0434\u043B\u044F headless setup (--name --age --stage --api-pre
   --base-url=<url>            \u0434\u043B\u044F custom
   --proto=openai|anthropic    \u0434\u043B\u044F custom
   --model=<model>
-  --api-key=<key>
+  --api-key=<key>             \u043D\u0435 \u043D\u0443\u0436\u0435\u043D \u0434\u043B\u044F \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0445 LM Studio/Ollama
   --name=<\u0438\u043C\u044F>                \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E\u0435 \u0438\u043C\u044F; \u0435\u0441\u043B\u0438 \u043F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u2014 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u043E\u0435 \u0438\u0437 \u043F\u0443\u043B\u0430 \u043F\u043E nationality (\u0442\u0443\u0440\u043D\u0438\u0440 \u0432\u044B\u0431\u043E\u0440\u0430 \u0438\u043C\u0451\u043D \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0422\u041E\u041B\u042C\u041A\u041E \u0432 TUI \u0432\u0438\u0437\u0430\u0440\u0434\u0435)
   --age=<n>
   --persona-notes=<text>      \u0434\u043E\u043F. \u043F\u043E\u0436\u0435\u043B\u0430\u043D\u0438\u044F \u043A persona/speech/communication \u043F\u0435\u0440\u0435\u0434 \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u0435\u0439
@@ -5659,7 +5837,9 @@ ${profiles.join("\n")}
     await runRuntime(cfg);
     return;
   }
-  const haveEnoughForFlags = argv.mode && argv["api-preset"] && argv["api-key"] && argv.age && argv.stage;
+  const presetForFlags = argv["api-preset"] ? findPreset(String(argv["api-preset"])) : void 0;
+  const apiKeyRequiredForFlags = presetForFlags?.apiKeyRequired !== false;
+  const haveEnoughForFlags = argv.mode && argv["api-preset"] && (!apiKeyRequiredForFlags || argv["api-key"]) && argv.age && argv.stage;
   if (haveEnoughForFlags) {
     const cfg = await buildConfigFromFlags(argv);
     await writeConfig(cfg);
@@ -5731,7 +5911,7 @@ async function buildConfigFromFlags(argv) {
     tz,
     mode,
     stage: argv.stage,
-    llm: { presetId, proto, baseURL, apiKey: String(argv["api-key"]), model },
+    llm: { presetId, proto, baseURL, apiKey: String(argv["api-key"] ?? preset?.defaultApiKey ?? ""), model },
     telegram: mode === "bot" ? { botToken: String(argv.token ?? "") } : {
       apiId: Number(argv["api-id"] ?? 0),
       apiHash: String(argv["api-hash"] ?? ""),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thesashadev/girl-agent",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Telegram AI persona engine with memory, schedule, relationship state and MTProto userbot mode.",
   "type": "module",
   "bin": {