@botconnector/bccli 0.4.0-beta.36 → 0.4.0-beta.38

package/dist/chunk-H5N4ST6B.js

@@ -0,0 +1,149 @@
+#!/usr/bin/env node
+import {
+  t
+} from "./chunk-4RMP4CNT.js";
+
+// src/presets.ts
+var PRESETS = [
+  { id: "bc-cloud", name: "BotConnector Cloud", baseURL: "https://api.botconnector.id/v1", apiKeyEnv: "BOTCONNECTOR_API_KEY" },
+  { id: "openrouter", name: "OpenRouter", baseURL: "https://openrouter.ai/api/v1", apiKeyEnv: "OPENROUTER_API_KEY" },
+  { id: "openai", name: "OpenAI", baseURL: "https://api.openai.com/v1", apiKeyEnv: "OPENAI_API_KEY" },
+  { id: "gemini", name: "Google Gemini", baseURL: "https://generativelanguage.googleapis.com/v1beta/openai", apiKeyEnv: "GEMINI_API_KEY" },
+  { id: "deepseek", name: "DeepSeek", baseURL: "https://api.deepseek.com/v1", apiKeyEnv: "DEEPSEEK_API_KEY" },
+  { id: "groq", name: "Groq", baseURL: "https://api.groq.com/openai/v1", apiKeyEnv: "GROQ_API_KEY" },
+  { id: "ollama-cloud", name: "Ollama Cloud", baseURL: "https://ollama.com/v1", apiKeyEnv: "OLLAMA_API_KEY" },
+  { id: "ollama", name: "Ollama lokal", baseURL: "http://127.0.0.1:11434/v1", local: true },
+  { id: "lmstudio", name: "LM Studio lokal", baseURL: "http://127.0.0.1:1234/v1", local: true }
+];
+
+// src/config.ts
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+var ConfigError = class extends Error {
+};
+var DEFAULT_MAX_STEPS = 100;
+var DEFAULT_CONFIG = {
+  model: "bc-cloud/glm-5.3-flash",
+  permissionMode: "default",
+  reasoning: "auto",
+  vision: true,
+  networkPolicy: "allow",
+  providers: Object.fromEntries(PRESETS.map((p) => [p.id, { baseURL: p.baseURL, apiKeyEnv: p.apiKeyEnv }])),
+  allow: []
+};
+function bccliHome(env = process.env) {
+  return env.BCCLI_HOME ?? join(homedir(), ".bccli");
+}
+function readJsonConfig(path) {
+  if (!existsSync(path)) return {};
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch (error) {
+    throw new ConfigError(t("Invalid config: {path} ({error})", { path, error: error.message }));
+  }
+}
+function resolvedMaxSteps(global) {
+  const value = global.maxSteps;
+  if (value === void 0) return DEFAULT_MAX_STEPS;
+  if (value === null || value === 0) return null;
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    throw new ConfigError(t("maxSteps must be a positive number, or 0/null to disable the limit."));
+  }
+  return Math.max(1, Math.floor(value));
+}
+function resolvedNetworkPolicy(global) {
+  const value = global.networkPolicy ?? "allow";
+  if (value !== "allow" && value !== "offline") {
+    throw new ConfigError(t('networkPolicy must be "allow" or "offline".'));
+  }
+  return value;
+}
+function resolvedPlugins(global) {
+  const value = global.plugins;
+  if (value === void 0) return [];
+  if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) {
+    throw new ConfigError(t("plugins must be an array of strings."));
+  }
+  return [...value];
+}
+function untrustedProviders(project, known) {
+  const out = {};
+  for (const [id, provider] of Object.entries(project.providers ?? {})) {
+    if (known[id] || typeof provider?.baseURL !== "string") continue;
+    out[id] = { baseURL: provider.baseURL };
+  }
+  return out;
+}
+function loadConfig(cwd, env = process.env) {
+  const global = readJsonConfig(join(bccliHome(env), "config.json"));
+  const project = readJsonConfig(join(cwd, ".bccli", "config.json"));
+  const known = { ...DEFAULT_CONFIG.providers, ...global.providers };
+  const fromProject = untrustedProviders(project, known);
+  return {
+    model: project.model ?? global.model ?? DEFAULT_CONFIG.model,
+    permissionMode: global.permissionMode ?? DEFAULT_CONFIG.permissionMode,
+    reasoning: global.reasoning ?? DEFAULT_CONFIG.reasoning,
+    maxSteps: resolvedMaxSteps(global),
+    hooks: global.hooks,
+    vision: global.vision ?? DEFAULT_CONFIG.vision,
+    networkPolicy: resolvedNetworkPolicy(global),
+    plugins: resolvedPlugins(global),
+    providers: { ...known, ...fromProject },
+    projectProviders: Object.keys(fromProject),
+    allow: [...global.allow ?? []]
+  };
+}
+function readCredentials(env = process.env) {
+  const path = join(bccliHome(env), "credentials");
+  if (!existsSync(path)) return {};
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return {};
+  }
+}
+function saveCredential(providerId, key, env = process.env) {
+  const home = bccliHome(env);
+  mkdirSync(home, { recursive: true });
+  const path = join(home, "credentials");
+  writeFileSync(path, JSON.stringify({ ...readCredentials(env), [providerId]: key }, null, 2), { mode: 384 });
+  chmodSync(path, 384);
+}
+function resolveModel(config, modelRef, env = process.env) {
+  const slash = modelRef.indexOf("/");
+  if (slash <= 0 || slash === modelRef.length - 1) {
+    throw new ConfigError(t("Model must be in provider/model format, e.g. bc-cloud/glm-5.3-flash (got: {ref})", { ref: modelRef }));
+  }
+  const providerId = modelRef.slice(0, slash);
+  const provider = config.providers[providerId];
+  if (!provider) {
+    throw new ConfigError(t('Provider "{id}" is not in the config. Available: {list}', { id: providerId, list: Object.keys(config.providers).join(", ") }));
+  }
+  const apiKey = (provider.apiKeyEnv ? env[provider.apiKeyEnv] : void 0) || readCredentials(env)[providerId] || void 0;
+  if (provider.apiKeyEnv && !apiKey) {
+    throw new ConfigError(t("No API key for {id} yet. Run `bccli login` or set the env var {env}.", { id: providerId, env: provider.apiKeyEnv }));
+  }
+  return { providerId, model: modelRef.slice(slash + 1), baseURL: provider.baseURL.replace(/\/+$/, ""), apiKey };
+}
+function removeCredential(providerId, env = process.env) {
+  const creds = readCredentials(env);
+  if (!(providerId in creds)) return false;
+  delete creds[providerId];
+  const path = join(bccliHome(env), "credentials");
+  writeFileSync(path, JSON.stringify(creds, null, 2), { mode: 384 });
+  chmodSync(path, 384);
+  return true;
+}
+
+export {
+  PRESETS,
+  ConfigError,
+  bccliHome,
+  readJsonConfig,
+  loadConfig,
+  readCredentials,
+  saveCredential,
+  resolveModel,
+  removeCredential
+};

package/dist/{chunk-QKWSDZJQ.js → chunk-H66PC2EB.js}

@@ -1,20 +1,10 @@
 #!/usr/bin/env node
-import {
-  hasKey,
-  providerName,
-  removeGlobalProvider,
-  writeGlobalConfig
-} from "./chunk-3DHJO7NC.js";
 import {
   reasoningPayload
-} from "./chunk-3NTTXK4Y.js";
+} from "./chunk-YURAIW7A.js";
 import {
-  PRESETS,
-  loadConfig,
-  readCredentials,
-  saveCredential,
   t
-} from "./chunk-CZMTWXCE.js";
+} from "./chunk-4RMP4CNT.js";
 
 // src/provider.ts
 import OpenAI from "openai";
@@ -98,15 +88,15 @@ function detectRepetition(text) {
 }
 function sleep(ms, signal) {
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(resolve, ms);
-    signal?.addEventListener(
-      "abort",
-      () => {
-        clearTimeout(timer);
-        reject(signal.reason);
-      },
-      { once: true }
-    );
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(signal?.reason);
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
 function errorMessage(body) {
@@ -205,11 +195,38 @@ async function readJson(res) {
   const thinking = (choice?.message?.reasoning_content || choice?.message?.reasoning || "") + split.thinking;
   return { text: split.text, toolCalls, thinking: thinking || void 0, usage: toUsage(body.usage), finishReason: choice?.finish_reason };
 }
+function contentText(content) {
+  if (typeof content === "string") return content;
+  const text = content.filter((part) => part.type === "text").map((part) => part.text).join(" ").trim();
+  const hasImage = content.some((part) => part.type === "image_url");
+  if (!hasImage) return text;
+  return text ? `${text} [image]` : "[image]";
+}
+function imageUserMessage(images) {
+  const paths = images.map((image) => image.path);
+  const caption = paths.length === 1 ? `Image read from ${paths[0]}.` : `Images read from ${paths.join(", ")}.`;
+  return {
+    role: "user",
+    content: [
+      { type: "text", text: caption },
+      ...images.map((image) => ({ type: "image_url", image_url: { url: `data:${image.mediaType};base64,${image.data}` } }))
+    ]
+  };
+}
 function responseInputFromMessages(messages) {
   const input = [];
   for (const message of messages) {
     if (message.role === "system" || message.role === "user") {
-      input.push({ role: message.role, content: message.content });
+      if (Array.isArray(message.content)) {
+        input.push({
+          role: message.role,
+          content: message.content.map(
+            (part) => part.type === "image_url" ? { type: "input_image", image_url: part.image_url.url } : { type: "input_text", text: part.text }
+          )
+        });
+      } else {
+        input.push({ role: message.role, content: message.content });
+      }
       continue;
     }
     if (message.role === "assistant") {
@@ -249,7 +266,7 @@ function shouldForceLunaPtc(messages, enabled) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const message = messages[i];
     if (message.role === "assistant" && message.responses_output_items?.some((item) => item.type === "program")) return true;
-    if (message.role === "user") return LUNA_PTC_FORCE_CUE.test(message.content);
+    if (message.role === "user") return LUNA_PTC_FORCE_CUE.test(contentText(message.content));
   }
   return false;
 }
@@ -264,7 +281,7 @@ function shouldEnableLunaPtc(messages, enabled, programmaticToolNames = []) {
   }
   const turn = messages.slice(Math.max(0, lastUser));
   const latestUser = lastUser >= 0 ? messages[lastUser] : void 0;
-  const prompt = latestUser?.role === "user" ? latestUser.content : "";
+  const prompt = latestUser?.role === "user" ? contentText(latestUser.content) : "";
   if (LUNA_PTC_MULTI_WORK_CUE.test(prompt)) return true;
   const safeToolNames = /* @__PURE__ */ new Set([...LUNA_PTC_SAFE_FUNCTIONS, ...programmaticToolNames]);
   const safeCalls = /* @__PURE__ */ new Set();
@@ -852,106 +869,16 @@ function createProvider(options) {
       const res = await doFetch(`${baseURL}/models`, { headers });
       if (!res.ok) throw new ProviderError(t("{status} while fetching the model list", { status: res.status }), res.status);
       const body = await res.json();
-      return (body.data ?? []).map((m) => m.id).sort();
+      const ids = (body.data ?? []).map((m) => m?.id).filter((id) => typeof id === "string" && id.length > 0);
+      return [...new Set(ids)].sort();
     }
   };
 }
 
-// src/models.ts
-function order(ids) {
-  const presetIds = PRESETS.map((p) => p.id);
-  const presets = presetIds.filter((id) => ids.includes(id));
-  const custom = ids.filter((id) => !presetIds.includes(id)).sort();
-  return [...presets, ...custom];
-}
-async function listAllModels(config, env = process.env, opts = {}) {
-  const timeoutMs = opts.timeoutMs ?? 5e3;
-  const baseFetch = opts.fetch ?? fetch;
-  const untrusted = new Set(config.projectProviders ?? []);
-  const ids = order(Object.keys(config.providers)).filter((id) => opts.only ? id === opts.only : !untrusted.has(id) && hasKey(config, id, env));
-  const results = await Promise.all(
-    ids.map(async (id) => {
-      const provider = config.providers[id];
-      const apiKey = (opts.keyOverride && id === opts.only ? opts.keyOverride : void 0) || (provider.apiKeyEnv ? env[provider.apiKeyEnv] : void 0) || readCredentials(env)[id] || void 0;
-      const local = !provider.apiKeyEnv;
-      const timedFetch = ((input, init) => baseFetch(input, { ...init, signal: AbortSignal.timeout(timeoutMs) }));
-      const list = createProvider({ baseURL: provider.baseURL.replace(/\/+$/, ""), apiKey, model: "", fetch: timedFetch }).listModels();
-      let timer;
-      const timeout = new Promise((_, reject) => {
-        timer = setTimeout(() => reject(new Error("timeout")), timeoutMs);
-      });
-      try {
-        const models = await Promise.race([list, timeout]);
-        return { providerId: id, providerName: providerName(config, id), models };
-      } catch {
-        if (local && !opts.only) return void 0;
-        return { providerId: id, providerName: providerName(config, id), models: [], error: t("could not be reached") };
-      } finally {
-        clearTimeout(timer);
-      }
-    })
-  );
-  return results.filter((g) => !!g);
-}
-
-// src/providerCli.ts
-async function addProviderKey(providerId, key, deps) {
-  const config = loadConfig(deps.cwd, deps.env);
-  const [group] = await listAllModels(config, deps.env, { only: providerId, fetch: deps.fetch, keyOverride: key || void 0 });
-  if (!group || group.error) return { ok: false, error: t("The API key was rejected or {provider} could not be reached.", { provider: providerName(config, providerId) }) };
-  if (key) saveCredential(providerId, key, deps.env);
-  return { ok: true, models: group.models.length };
-}
-async function runProviderCommand(args, deps) {
-  const [action = "list", id] = args.subArgs;
-  const config = loadConfig(deps.cwd, deps.env);
-  if (action === "list") {
-    for (const pid of Object.keys(config.providers)) {
-      const mark = hasKey(config, pid, deps.env) ? "\u2713" : "\u25CB";
-      deps.out(`${mark} ${pid.padEnd(14)} ${providerName(config, pid).padEnd(20)} ${config.providers[pid].baseURL}`);
-    }
-    return 0;
-  }
-  if (!id) {
-    deps.err(t("Usage: bccli provider {action} <id>", { action }));
-    return 1;
-  }
-  if (action === "remove") {
-    removeGlobalProvider(id, deps.env);
-    deps.out(t("{id} removed.", { id }));
-    return 0;
-  }
-  if (action !== "add") {
-    deps.err(t("Unknown action: {action}. Use list, add, or remove.", { action }));
-    return 1;
-  }
-  const preset = PRESETS.find((p) => p.id === id);
-  if (!preset && !config.providers[id]) {
-    if (!args.url) {
-      deps.err(t("{id} is not a preset. For a custom provider add --url <OpenAI-compatible base URL>.", { id }));
-      return 1;
-    }
-    writeGlobalConfig(
-      { providers: { [id]: { baseURL: args.url, ...args.name ? { name: args.name } : {}, ...args.keyEnv ? { apiKeyEnv: args.keyEnv } : {} } } },
-      deps.env
-    );
-  }
-  const needsKey = !!loadConfig(deps.cwd, deps.env).providers[id].apiKeyEnv || !preset;
-  const key = needsKey ? await deps.readSecret(t("API key for {id} (leave empty if not needed): ", { id })) : "";
-  const result = await addProviderKey(id, key, deps);
-  if (!result.ok) {
-    deps.err(result.error);
-    return 1;
-  }
-  deps.out(t("{id} is ready. {n} models available.", { id, n: result.models }));
-  return 0;
-}
-
 export {
+  contentText,
+  imageUserMessage,
   hasPendingProgrammaticReplay,
   completionAssistantMessage,
-  createProvider,
-  listAllModels,
-  addProviderKey,
-  runProviderCommand
+  createProvider
 };

package/dist/{chunk-5LSTEXSG.js → chunk-HPZSXX4W.js}

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 import {
-  ConfigError,
+  ConfigError
+} from "./chunk-H5N4ST6B.js";
+import {
   t
-} from "./chunk-CZMTWXCE.js";
+} from "./chunk-4RMP4CNT.js";
 
 // src/mcp/catalog.ts
 var CATALOG = [
@@ -12,6 +14,7 @@ var CATALOG = [
   {
     name: "filesystem",
     description: "access folders outside the project",
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${dir} is filled by fillTemplate, not a template literal
     config: { command: "npx", args: ["-y", "@modelcontextprotocol/server-filesystem", "${dir}"] },
     inputs: [{ key: "dir", label: "Folder the server may access" }]
   },
@@ -19,6 +22,7 @@ var CATALOG = [
   {
     name: "github",
     description: "GitHub issues, PRs, and repos",
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${token} is filled by fillTemplate, not a template literal
     config: { type: "http", url: "https://api.githubcopilot.com/mcp/", headers: { Authorization: "Bearer ${token}" } },
     inputs: [{ key: "token", label: "GitHub Personal Access Token", secret: true }]
   }