@artillect/cli 0.1.2 → 0.1.3

package/dist/index.js

@@ -3,6 +3,11 @@
 // src/index.ts
 import { Command } from "commander";
 
+// src/config.ts
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
 // ../artillect-sdk/dist/uploadMime.js
 import { basename, isAbsolute, resolve } from "node:path";
 import { access, readFile } from "node:fs/promises";
@@ -176,6 +181,8 @@ async function publicApiFetch(config, method, path, body, extraHeaders) {
     Authorization: `Bearer ${config.apiKey}`,
     Accept: "application/json"
   };
+  if (config.clientSource)
+    headers["X-Artillect-Client-Source"] = config.clientSource;
   let payload;
   if (body !== void 0) {
     headers["Content-Type"] = "application/json";
@@ -201,7 +208,8 @@ async function publicApiUploadFile(config, file) {
     method: "POST",
     headers: {
       Authorization: `Bearer ${config.apiKey}`,
-      Accept: "application/json"
+      Accept: "application/json",
+      ...config.clientSource ? { "X-Artillect-Client-Source": config.clientSource } : {}
     },
     body: form
   });
@@ -288,7 +296,11 @@ function createClient(opts) {
   if (!apiKey)
     throw new Error("apiKey is required");
   const baseUrl = String(opts.baseUrl || "https://app.artillect.pro").trim().replace(/\/+$/, "");
-  const config = { apiKey, baseUrl };
+  const config = {
+    apiKey,
+    baseUrl,
+    ...opts.clientSource ? { clientSource: opts.clientSource } : {}
+  };
   return {
     config,
     getHealth: () => publicApiFetch(config, "GET", "/api/v1/health"),
@@ -335,9 +347,6 @@ function createClient(opts) {
 }
 
 // src/config.ts
-import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
 var DEFAULT_BASE = "https://app.artillect.pro";
 function configPath() {
   const xdg = String(process.env.XDG_CONFIG_HOME || "").trim();
@@ -371,6 +380,14 @@ function requireApiKey() {
   }
   return cfg;
 }
+function createCliClient(cfg) {
+  const resolved = cfg ?? requireApiKey();
+  return createClient({
+    apiKey: resolved.apiKey,
+    baseUrl: resolved.baseUrl,
+    clientSource: "cli"
+  });
+}
 function saveCliConfig(cfg) {
   const path = configPath();
   mkdirSync(dirname(path), { recursive: true });
@@ -746,7 +763,7 @@ async function authStatus() {
   const envKey = Boolean(String(process.env.ARTILLECT_API_KEY || "").trim());
   try {
     const cfg = requireApiKey();
-    const client = createClient({ apiKey: cfg.apiKey, baseUrl: cfg.baseUrl });
+    const client = createCliClient(cfg);
     const me = await client.getMe();
     if (!me.ok) {
       console.log(
@@ -767,7 +784,7 @@ async function authStatus() {
 // src/generate.ts
 async function cmdBalance(jsonMode) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.getBalance();
   if (!res.ok) fail(res);
   const body = asRecord(res.body);
@@ -822,7 +839,7 @@ async function cmdModelsGet(slug, jsonMode) {
 }
 async function cmdUpload(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const projectId = opts.projectId ? parseProjectId(opts.projectId) : void 0;
   const uploaded = await uploadLocal(
     client,
@@ -836,7 +853,7 @@ async function cmdUpload(opts) {
 }
 async function cmdEstimate(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const body = {
     type: opts.type,
     prompt: opts.prompt
@@ -849,7 +866,7 @@ async function cmdEstimate(opts) {
 }
 async function cmdGenerateImage(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const projectId = opts.projectId ? parseProjectId(opts.projectId) : void 0;
   const inputUrls = [];
   for (const ref of opts.input ?? []) {
@@ -880,7 +897,7 @@ async function cmdGenerateImage(opts) {
 }
 async function cmdGenerateVideo(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const projectId = opts.projectId ? parseProjectId(opts.projectId) : void 0;
   const body = { model: opts.model, prompt: opts.prompt };
   if (projectId != null) body.project_id = projectId;
@@ -916,7 +933,7 @@ async function cmdGenerateVideo(opts) {
 }
 async function cmdGenerateGet(taskId, jsonMode) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.getTask(taskId);
   if (!res.ok) fail(res);
   const body = asRecord(res.body);
@@ -924,7 +941,7 @@ async function cmdGenerateGet(taskId, jsonMode) {
 }
 async function cmdGenerateWait(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   await finishAndSave(client, opts.taskId, {
     json: opts.json,
     out: opts.out,
@@ -934,7 +951,7 @@ async function cmdGenerateWait(opts) {
 }
 async function cmdGenerateCancel(taskId, jsonMode) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const kind = inferJobKind(taskId);
   const res = kind === "image" ? await client.cancelImageGeneration(taskId) : kind === "video" ? await client.cancelVideoGeneration(taskId) : kind === "upscale" ? await client.cancelUpscaleGeneration(taskId) : kind === "mesh" ? await client.cancelMeshGeneration(taskId) : kind === "switchx" ? await client.cancelSwitchxGeneration(taskId) : null;
   if (!res) {
@@ -945,7 +962,7 @@ async function cmdGenerateCancel(taskId, jsonMode) {
 }
 async function cmdGenerateList(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const params = {
     limit: opts.limit,
     ...opts.cursor ? { cursor: opts.cursor } : {}
@@ -979,7 +996,7 @@ function itemsOf(body) {
 }
 async function cmdAssetsList(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.listAssets({
     limit: opts.limit,
     ...opts.kind ? { kind: opts.kind } : {},
@@ -1005,7 +1022,7 @@ async function cmdAssetsGet(assetId, json) {
   const id = assetId.trim();
   if (!isAssetId(id)) throw new Error(`\u043D\u0435 \u043F\u043E\u0445\u043E\u0436\u0435 \u043D\u0430 asset id: ${assetId} (\u043E\u0436\u0438\u0434\u0430\u044E ast_\u2026)`);
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.getAsset(id);
   if (!res.ok) fail(res);
   const body = asRecord(res.body);
@@ -1026,7 +1043,7 @@ async function cmdAssetsCopy(opts) {
     throw new Error("\u0443\u043A\u0430\u0436\u0438\u0442\u0435 --project <id> \u0438\u043B\u0438 --personal");
   }
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.copyAsset(
     id,
     opts.personal ? { target: "personal" } : { target: "project", project_id: parseProjectId(String(opts.projectId)) }
@@ -1046,7 +1063,7 @@ async function cmdAssetsCopy(opts) {
 }
 async function cmdProjectsList(opts) {
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.listProjects({
     limit: opts.limit,
     ...opts.cursor ? { cursor: opts.cursor } : {}
@@ -1063,7 +1080,7 @@ async function cmdProjectsList(opts) {
 async function cmdElementsList(opts) {
   const projectId = parseProjectId(opts.projectId);
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   const res = await client.listProjectElements(projectId, {
     limit: opts.limit,
     ...opts.kinds ? { kinds: opts.kinds } : {},
@@ -1100,7 +1117,7 @@ async function cmdElementsCreate(opts) {
   if (!name) throw new Error("\u0443\u043A\u0430\u0436\u0438\u0442\u0435 --name \u0431\u0435\u0437 \u043F\u0443\u0441\u0442\u043E\u0433\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F");
   const projectId = parseProjectId(opts.projectId);
   const cfg = requireApiKey();
-  const client = createClient(cfg);
+  const client = createCliClient(cfg);
   let assetId = "";
   let imageUrl = "";
   let kind = String(opts.kind || "").toLowerCase();
@@ -1167,7 +1184,7 @@ function parse(raw) {
   return [Number(m[1]), Number(m[2]), Number(m[3])];
 }
 function cliVersion() {
-  return String("0.1.2");
+  return String("0.1.3");
 }
 function updateAvailableMessage(local, latest) {
   return `\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F @artillect/cli (${latest}, \u0443 \u0432\u0430\u0441 ${local}).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artillect/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Artillect CLI — генерация картинок и видео из терминала.",
   "type": "module",
   "license": "UNLICENSED",