@botconnector/bccli 0.4.1 → 0.4.2

package/dist/{chunk-FLQPE4S5.js → chunk-RX4UQX43.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/config.ts
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
@@ -236,8 +236,11 @@ function loadConfig(cwd, env = process.env) {
   const project = readJsonConfig(join(cwd, ".bccli", "config.json"));
   const known = { ...DEFAULT_CONFIG.providers, ...global.providers };
   const fromProject = untrustedProviders(project, known);
+  const rawFallbacks = project.fallbackModels ?? global.fallbackModels;
+  const fallbackModels = Array.isArray(rawFallbacks) ? rawFallbacks.filter((m) => typeof m === "string" && m.includes("/")) : void 0;
   return {
     model: project.model ?? global.model ?? DEFAULT_CONFIG.model,
+    ...fallbackModels?.length ? { fallbackModels } : {},
     permissionMode: global.permissionMode ?? DEFAULT_CONFIG.permissionMode,
     reasoning: global.reasoning ?? DEFAULT_CONFIG.reasoning,
     thinkingVisible: global.thinkingVisible === true,

package/dist/{chunk-BC7UXFE4.js → chunk-SVD4LHJC.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   contentText
-} from "./chunk-WNACAUDK.js";
+} from "./chunk-5YJ3ZQVR.js";
 
 // src/session.ts
 import { randomBytes } from "crypto";
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync } from "fs";
-import { join } from "path";
+import { basename, join } from "path";
 function projectDir(home, cwd) {
   const slug = cwd.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(-100) || "root";
   return join(home, "sessions", slug);
@@ -27,6 +27,9 @@ var Session = class _Session {
     this.file = file;
   }
   file;
+  get id() {
+    return basename(this.file, ".jsonl");
+  }
   static create(home, cwd, now = /* @__PURE__ */ new Date()) {
     const dir = projectDir(home, cwd);
     mkdirSync(dir, { recursive: true });
@@ -38,7 +41,7 @@ var Session = class _Session {
     if (!existsSync(dir)) return [];
     return readdirSync(dir).filter((f) => f.endsWith(".jsonl")).map((f) => {
       const session = new _Session(join(dir, f));
-      const first = session.load().find((m) => m.role === "user");
+      const first = session.loadHistory().find((m) => m.role === "user");
       return { session, mtime: statSync(session.file).mtime, preview: first ? contentText(first.content).slice(0, 80) : "" };
     }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime() || b.session.file.localeCompare(a.session.file));
   }
@@ -88,6 +91,35 @@ var Session = class _Session {
     }
     return void 0;
   }
+  /** Accumulated token usage since the last non-compaction reset. */
+  totalUsage() {
+    const segments = [{ msgs: [], usage: { inputTokens: 0, outputTokens: 0 } }];
+    for (const record of this.records()) {
+      const cur = segments[segments.length - 1];
+      if (record.t === "reset") {
+        segments.push({ msgs: [], usage: { inputTokens: 0, outputTokens: 0 } });
+      } else if (record.t === "msg") {
+        cur.msgs.push(record.m);
+      } else if (record.t === "usage") {
+        cur.usage.inputTokens += record.inputTokens;
+        cur.usage.outputTokens += record.outputTokens;
+        if (record.cachedInputTokens) cur.usage.cachedInputTokens = (cur.usage.cachedInputTokens ?? 0) + record.cachedInputTokens;
+        if (record.cacheWriteTokens) cur.usage.cacheWriteTokens = (cur.usage.cacheWriteTokens ?? 0) + record.cacheWriteTokens;
+      }
+    }
+    let total = { ...segments[0].usage };
+    for (const seg of segments.slice(1)) {
+      if (!isCompactionSummary(seg.msgs[0])) {
+        total = { ...seg.usage };
+      } else {
+        total.inputTokens += seg.usage.inputTokens;
+        total.outputTokens += seg.usage.outputTokens;
+        if (seg.usage.cachedInputTokens) total.cachedInputTokens = (total.cachedInputTokens ?? 0) + seg.usage.cachedInputTokens;
+        if (seg.usage.cacheWriteTokens) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + seg.usage.cacheWriteTokens;
+      }
+    }
+    return total;
+  }
   /**
    * What the user sees on resume: the whole conversation. Compaction only shrinks what the model is sent, so
    * its reset does not hide the older turns here. A real reset (/clear, rewind) still starts over, the
@@ -100,12 +132,22 @@ var Session = class _Session {
       else if (record.t === "msg") segments[segments.length - 1].push(record.m);
     }
     let shown = segments[0];
+    let lastSummary;
     for (const segment of segments.slice(1)) {
       if (!isCompactionSummary(segment[0])) {
         shown = segment;
+        lastSummary = void 0;
         continue;
       }
       const kept = segment.slice(2);
+      if (lastSummary && sameMessage(segment[0], lastSummary)) {
+        const subIdx = findContiguousSlice(shown, kept);
+        if (subIdx !== -1) {
+          shown = shown.slice(0, subIdx + kept.length);
+          continue;
+        }
+      }
+      lastSummary = segment[0];
       let at = 0;
       while (at <= shown.length && !endsWithPrefixOf(shown, at, kept)) at++;
       shown = [...shown, ...kept.slice(shown.length - at)];
@@ -132,12 +174,31 @@ function endsWithPrefixOf(shown, at, kept) {
   for (let j = 0; j < n; j++) if (!sameMessage(shown[at + j], kept[j])) return false;
   return true;
 }
+function findContiguousSlice(shown, slice) {
+  if (slice.length === 0) return shown.length;
+  for (let i = 0; i + slice.length <= shown.length; i++) {
+    let ok = true;
+    for (let j = 0; j < slice.length; j++) {
+      if (!sameMessage(shown[i + j], slice[j])) {
+        ok = false;
+        break;
+      }
+    }
+    if (ok) return i;
+  }
+  return -1;
+}
 function pruneSessions(home, now = Date.now(), maxAgeDays = 30) {
   const root = join(home, "sessions");
   if (!existsSync(root)) return 0;
   let removed = 0;
   for (const project of readdirSync(root)) {
     const dir = join(root, project);
+    try {
+      if (!statSync(dir).isDirectory()) continue;
+    } catch {
+      continue;
+    }
     for (const file of readdirSync(dir)) {
       const path = join(dir, file);
       if (now - statSync(path).mtimeMs > maxAgeDays * 864e5) {

package/dist/{chunk-BXQQCUAC.js → chunk-TIMSYZIR.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   defaultOpen
-} from "./chunk-MFHCQQEN.js";
+} from "./chunk-3I5BW3ZT.js";
 import {
   removeCredential,
   saveCredential
-} from "./chunk-FLQPE4S5.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/login.ts
 function readSecret(prompt) {
@@ -91,8 +91,8 @@ function defaultLoginDeps() {
     fetch: globalThis.fetch,
     // Wiring NYATA jalur lama: persis runLogin lama (provider add + prompt key).
     legacyAdd: async (providerId, targetCwd) => {
-      const { runProviderCommand } = await import("./providerCli-NMUFXAAS.js");
-      const { parseCliArgs: parse } = await import("./args-W6BNKY7K.js");
+      const { runProviderCommand } = await import("./providerCli-5OZI2GQQ.js");
+      const { parseCliArgs: parse } = await import("./args-NRTZWWEV.js");
       return runProviderCommand(parse(["provider", "add", providerId]), {
         env: process.env,
         cwd: targetCwd,
@@ -117,12 +117,12 @@ async function runLogin(providerId, cwd, args, deps) {
       );
       return 1;
     }
-    const { runOauthLogout } = await import("./oauthLogin-6FWQABJ7.js");
+    const { runOauthLogout } = await import("./oauthLogin-XWY7OHCG.js");
     return runOauthLogout({ out: deps.out, err: deps.err, env: deps.env, removeCredential: deps.removeCredential });
   }
   if (args.key) return deps.legacyAdd(providerId, cwd);
   if (providerId === "openrouter") {
-    const { runOauthLogin } = await import("./oauthLogin-6FWQABJ7.js");
+    const { runOauthLogin } = await import("./oauthLogin-XWY7OHCG.js");
     return runOauthLogin({
       out: deps.out,
       err: deps.err,

package/dist/{chunk-MHIYLXJC.js → chunk-WFZKJY3R.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/permissions.ts
-import { isAbsolute, relative, resolve, sep } from "path";
+import { isAbsolute, relative, resolve } from "path";
 var MODE_ORDER = ["default", "acceptEdits", "plan", "allowAll"];
 function nextMode(mode) {
   return MODE_ORDER[(MODE_ORDER.indexOf(mode) + 1) % MODE_ORDER.length];
@@ -62,7 +62,9 @@ function commandKey(segment) {
 function requiresSensitiveToolApproval(req) {
   const target = req.target.trim();
   if (req.kind === "read" || req.kind === "edit") {
-    return /(?:^|[/\\])(?:\.env(?:\..*)?|\.ssh|\.aws|\.config\/gcloud|secrets?|credentials?)(?:[/\\]|$)/i.test(target) || /(?:id_rsa|id_ed25519|\.pem|\.p12|\.key)$/i.test(target);
+    return /(?:^|[\s/\\])(?:\.env(?:\.[^\s/\\]+)?|\.ssh|\.aws|\.config[/\\]gcloud|\.npmrc|\.netrc|\.git-credentials|(?:secrets?|credentials?)(?:\.[a-z0-9_-]+)?)(?:[\s/\\]|$)/i.test(
+      target
+    ) || /(?:id_rsa|id_ed25519|\.pem|\.p12|\.key)(?:\s|$)/i.test(target);
   }
   if (req.kind === "bash") {
     return /\b(?:rm\s+-[a-z]*r[a-z]*f[a-z]*\s|rm\s+-[a-z]*f[a-z]*r[a-z]*\s|mkfs(?:\.|\s)|wipefs\b|shred\s|git\s+push\s+(?:--force|-f)\b|docker\s+(?:system\s+prune|volume\s+rm)|kubectl\s+delete\b|drop\s+(?:database|table)|npm\s+publish\b)/i.test(target) || /\b(?:deploy-service\.sh|aws\s+secretsmanager|cat\s+[^;&|]*\.env\b)/i.test(target);
@@ -87,7 +89,8 @@ var Permissions = class {
   editInProject(target) {
     const rel = relative(this.cwd, resolve(this.cwd, target));
     if (!rel || rel.startsWith("..") || isAbsolute(rel)) return false;
-    return !rel.split(sep).includes(".git") && !rel.split("/").includes(".git");
+    const parts = rel.split(/[/\\]/).map((p) => p.toLowerCase());
+    return !parts.includes(".git");
   }
   /** Rules that "[a] allow for this session" would add; undefined when it must always be asked. */
   rulesFor(req) {
@@ -105,7 +108,7 @@ var Permissions = class {
       if (/`|\$\(|[<>]|^\s*[({]/.test(req.target)) return void 0;
       const segments = req.target.split(/&&|\|\||[;&|\n]/).map((s) => s.trim()).filter(Boolean);
       if (!segments.length) return void 0;
-      if (segments.some(isAlwaysAsk)) return void 0;
+      if (segments.some((s) => /^[({]/.test(s) || isAlwaysAsk(s))) return void 0;
       return [...new Set(segments.map((s) => `bash(${commandKey(s)})`))];
     }
     if (req.kind === "mcp") return [`mcp(${req.tool})`];
@@ -139,5 +142,6 @@ var Permissions = class {
 export {
   MODE_ORDER,
   nextMode,
+  requiresSensitiveToolApproval,
   Permissions
 };

package/dist/{chunk-BGXNR74O.js → chunk-ZEPTUKNW.js}

@@ -4,11 +4,13 @@ import {
 } from "./chunk-PSO7R5AD.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/tools/bash.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
 import { z } from "zod";
 
 // src/tools/sandbox.ts
@@ -236,7 +238,7 @@ function offlineEnv(env = process.env) {
   };
 }
 function runCommand(command, opts) {
-  return new Promise((resolve) => {
+  return new Promise((resolve3) => {
     const child = spawnChild(command, opts.cwd, opts.env, opts.shell ?? defaultShell());
     if (!exitHookInstalled) {
       process.on("exit", killAllCommands);
@@ -249,7 +251,14 @@ function runCommand(command, opts) {
     let dropped = 0;
     let timedOut = false;
     let aborted = false;
+    const fullChunks = [];
+    let fullBytes = 0;
+    const MAX_SPILL_BYTES = 10 * 1024 * 1024;
     const onData = (data) => {
+      if (fullBytes < MAX_SPILL_BYTES) {
+        fullChunks.push(data);
+        fullBytes += data.length;
+      }
       let s = data;
       if (head.length < HALF) {
         const take = s.slice(0, HALF - head.length);
@@ -288,10 +297,19 @@ function runCommand(command, opts) {
       active.delete(killAsAborted);
       clearTimeout(timer);
       opts.signal.removeEventListener("abort", onAbort);
+      let spillNote = "";
+      if (dropped && fullChunks.length) {
+        try {
+          const spillPath = join(tmpdir(), `bccli-bash-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.log`);
+          writeFileSync(spillPath, fullChunks.join(""), "utf8");
+          spillNote = `; full output saved to ${spillPath}`;
+        } catch {
+        }
+      }
       const output = dropped ? `${head}
-\u2026 [${dropped} characters truncated] \u2026
+\u2026 [${dropped} characters truncated${spillNote}] \u2026
 ${tail}` : head + tail;
-      resolve({ output: output + extra, exitCode, timedOut, aborted });
+      resolve3({ output: output + extra, exitCode, timedOut, aborted });
     };
     child.on("error", (error) => finish(null, error.message));
     child.on("close", (code) => finish(code));
@@ -403,7 +421,7 @@ var BUILTIN_AGENTS = [
 
 // src/context.ts
 import { existsSync as existsSync3, readFileSync } from "fs";
-import { dirname, join } from "path";
+import { dirname, join as join2 } from "path";
 var FILES = ["AGENTS.md", "CLAUDE.md", "BCCLI.md"];
 function readIf(path) {
   try {
@@ -418,7 +436,7 @@ function instructionPaths(cwd, home) {
     dirs2.unshift(dir);
     if (dirname(dir) === dir) break;
   }
-  return [join(home, "BCCLI.md"), ...dirs2.flatMap((dir) => FILES.map((name) => join(dir, name)))];
+  return [join2(home, "BCCLI.md"), ...dirs2.flatMap((dir) => FILES.map((name) => join2(dir, name)))];
 }
 function loadInstructions(cwd, home) {
   const parts = [];
@@ -431,7 +449,7 @@ ${text}`);
 }
 function isGitRepo(cwd) {
   for (let dir = cwd; ; dir = dirname(dir)) {
-    if (existsSync3(join(dir, ".git"))) return true;
+    if (existsSync3(join2(dir, ".git"))) return true;
     if (dirname(dir) === dir) return false;
   }
 }
@@ -476,15 +494,33 @@ ${instructions}` : ""}`;
 
 // src/extensions.ts
 import { existsSync as existsSync4, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
-import { basename, join as join2 } from "path";
+import { basename, join as join3 } from "path";
 function parseFrontmatter(text) {
   const match = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(text);
   if (!match) return { data: {}, body: text };
   const data = {};
+  let currentListKey;
   for (const line of match[1].split(/\r?\n/)) {
+    const listItem = /^\s*-\s+(.+)$/.exec(line);
+    if (listItem && currentListKey) {
+      const item = listItem[1].trim().replace(/^["']|["']$/g, "");
+      const prev = data[currentListKey];
+      if (Array.isArray(prev)) prev.push(item);
+      else data[currentListKey] = [item];
+      continue;
+    }
     const kv = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line);
-    if (!kv) continue;
+    if (!kv) {
+      if (line.trim()) currentListKey = void 0;
+      continue;
+    }
     let value = kv[2].trim();
+    if (!value) {
+      currentListKey = kv[1];
+      data[kv[1]] = "";
+      continue;
+    }
+    currentListKey = void 0;
     if (value.startsWith("[") && value.endsWith("]")) {
       data[kv[1]] = value.slice(1, -1).split(",").map((s) => s.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
       continue;
@@ -496,7 +532,7 @@ function parseFrontmatter(text) {
 }
 var str = (v) => Array.isArray(v) ? v.join(", ") : v;
 function dirs(r, kind) {
-  return [join2(r.userHome, ".claude", kind), join2(r.home, kind), join2(r.cwd, ".claude", kind), join2(r.cwd, ".bccli", kind)];
+  return [join3(r.userHome, ".claude", kind), join3(r.home, kind), join3(r.cwd, ".claude", kind), join3(r.cwd, ".bccli", kind)];
 }
 function list(dir) {
   try {
@@ -509,11 +545,11 @@ function loadSkills(r) {
   const byName = /* @__PURE__ */ new Map();
   for (const dir of dirs(r, "skills")) {
     for (const entry of list(dir)) {
-      const file = join2(dir, entry, "SKILL.md");
+      const file = join3(dir, entry, "SKILL.md");
       if (!existsSync4(file)) continue;
       const { data } = parseFrontmatter(readFileSync2(file, "utf8"));
       const name = str(data.name) || entry;
-      byName.set(name, { name, description: str(data.description) ?? "", dir: join2(dir, entry), file });
+      byName.set(name, { name, description: str(data.description) ?? "", dir: join3(dir, entry), file });
     }
   }
   return [...byName.values()];
@@ -522,7 +558,7 @@ function loadCommands(r) {
   const byName = /* @__PURE__ */ new Map();
   for (const dir of dirs(r, "commands")) {
     for (const entry of list(dir)) {
-      const file = join2(dir, entry);
+      const file = join3(dir, entry);
       if (!entry.endsWith(".md") || !statSync(file).isFile()) continue;
       const { data, body } = parseFrontmatter(readFileSync2(file, "utf8"));
       const def = { name: basename(entry, ".md"), body: body.trim() };
@@ -538,7 +574,7 @@ function loadAgentDefs(r) {
   for (const dir of dirs(r, "agents")) {
     for (const entry of list(dir)) {
       if (!entry.endsWith(".md")) continue;
-      const { data, body } = parseFrontmatter(readFileSync2(join2(dir, entry), "utf8"));
+      const { data, body } = parseFrontmatter(readFileSync2(join3(dir, entry), "utf8"));
       const name = str(data.name) || basename(entry, ".md");
       const def = { name, description: str(data.description) ?? "", prompt: body.trim() };
       if (data.tools)
@@ -573,7 +609,7 @@ function runOne(command, event, payload, opts) {
     ...payload.input !== void 0 ? { BCCLI_HOOK_INPUT: JSON.stringify(payload.input) } : {},
     ...payload.output !== void 0 ? { BCCLI_HOOK_OUTPUT: payload.output } : {}
   };
-  return new Promise((resolve) => {
+  return new Promise((resolve3) => {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
@@ -582,7 +618,7 @@ function runOne(command, event, payload, opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve(result);
+      resolve3(result);
     };
     let child;
     const shell = defaultShell();
@@ -598,7 +634,7 @@ function runOne(command, event, payload, opts) {
         child = spawn2(command, { shell: true, env, cwd: opts.cwd ?? process.cwd(), stdio: ["ignore", "pipe", "pipe"] });
       }
     } catch (error) {
-      resolve({ failure: error.message });
+      resolve3({ failure: error.message });
       return;
     }
     const timer = setTimeout(() => {
@@ -648,6 +684,38 @@ async function runHooks(hooks, event, payload = {}, opts = {}) {
   return { blocked, warnings };
 }
 
+// src/tools/paths.ts
+import { statSync as statSync2 } from "fs";
+import { isAbsolute, resolve } from "path";
+var readMtimes = /* @__PURE__ */ new WeakMap();
+function resolvePath(cwd, path) {
+  return isAbsolute(path) ? path : resolve(cwd, path);
+}
+function errorCode(error) {
+  return error.code ?? error.message;
+}
+function recordFileMtime(readFiles, abs) {
+  readFiles.add(abs);
+  try {
+    let map = readMtimes.get(readFiles);
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
+      readMtimes.set(readFiles, map);
+    }
+    map.set(abs, statSync2(abs).mtimeMs);
+  } catch {
+  }
+}
+function isFileModifiedSinceRead(readFiles, abs) {
+  const recorded = readMtimes.get(readFiles)?.get(abs);
+  if (recorded === void 0) return false;
+  try {
+    return statSync2(abs).mtimeMs > recorded + 50;
+  } catch {
+    return false;
+  }
+}
+
 // src/slash/memory.ts
 import { appendFileSync, existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 function instructionFiles(cwd, home) {
@@ -665,22 +733,38 @@ function parseMemoryArgs(args) {
 
 // src/tools/ignore.ts
 import { readFileSync as readFileSync4 } from "fs";
-import { join as join3 } from "path";
-function ignorePatterns(root) {
+import { dirname as dirname2, join as join4, resolve as resolve2 } from "path";
+function ignorePatterns(root, projectRoot) {
   const patterns = ["**/node_modules/**", "**/.git/**"];
-  let lines = [];
-  try {
-    lines = readFileSync4(join3(root, ".gitignore"), "utf8").split(/\r?\n/);
-  } catch {
-    return patterns;
+  const seen = /* @__PURE__ */ new Set();
+  const dirs2 = [];
+  let cur = resolve2(root);
+  const stop = projectRoot ? resolve2(projectRoot) : cur;
+  while (true) {
+    if (!seen.has(cur)) {
+      seen.add(cur);
+      dirs2.push(cur);
+    }
+    if (cur === stop || !cur.startsWith(stop)) break;
+    const parent = dirname2(cur);
+    if (parent === cur) break;
+    cur = parent;
   }
-  for (const raw of lines) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#") || line.startsWith("!")) continue;
-    const p = line.replace(/^\//, "").replace(/\/$/, "");
-    patterns.push(`**/${p}`, `**/${p}/**`);
+  for (const dir of dirs2) {
+    let lines = [];
+    try {
+      lines = readFileSync4(join4(dir, ".gitignore"), "utf8").split(/\r?\n/);
+    } catch {
+      continue;
+    }
+    for (const raw of lines) {
+      const line = raw.trim();
+      if (!line || line.startsWith("#") || line.startsWith("!")) continue;
+      const p = line.replace(/^\//, "").replace(/\/$/, "");
+      patterns.push(`**/${p}`, `**/${p}/**`);
+    }
   }
-  return patterns;
+  return [...new Set(patterns)];
 }
 
 // src/tools/globSafety.ts
@@ -718,6 +802,10 @@ export {
   runCommand,
   createBashTool,
   bashTool,
+  resolvePath,
+  errorCode,
+  recordFileMtime,
+  isFileModifiedSinceRead,
   ignorePatterns,
   validateGlobPattern,
   normalizeGlobPath,