@kkelly-offical/kkcode 0.1.7 → 0.2.3-preview.1

package/src/update/checker.mjs

@@ -0,0 +1,184 @@
+import { spawn } from "node:child_process"
+import { readFile, writeFile } from "node:fs/promises"
+import { dirname } from "node:path"
+import { mkdir } from "node:fs/promises"
+import { PACKAGE_NAME, PACKAGE_VERSION } from "../version.mjs"
+import { updateStatePath } from "../storage/paths.mjs"
+
+const DEFAULT_REGISTRY = "https://registry.npmjs.org"
+const DEFAULT_TIMEOUT_MS = 2500
+
+function normalizeRegistry(registry = DEFAULT_REGISTRY) {
+  return String(registry || DEFAULT_REGISTRY).replace(/\/+$/, "")
+}
+
+function encodePackageName(name) {
+  return String(name).replace("/", "%2F")
+}
+
+function parseVersion(version) {
+  const match = String(version || "").trim().match(/^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/)
+  if (!match) return null
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    prerelease: match[4] ? match[4].split(".").map((part) => (/^\d+$/.test(part) ? Number(part) : part)) : []
+  }
+}
+
+function compareIdentifier(a, b) {
+  if (a === b) return 0
+  const aNum = typeof a === "number"
+  const bNum = typeof b === "number"
+  if (aNum && bNum) return a > b ? 1 : -1
+  if (aNum) return -1
+  if (bNum) return 1
+  return String(a) > String(b) ? 1 : -1
+}
+
+export function compareVersions(a, b) {
+  const av = parseVersion(a)
+  const bv = parseVersion(b)
+  if (!av || !bv) return String(a || "").localeCompare(String(b || ""))
+  for (const key of ["major", "minor", "patch"]) {
+    if (av[key] !== bv[key]) return av[key] > bv[key] ? 1 : -1
+  }
+  const aPre = av.prerelease
+  const bPre = bv.prerelease
+  if (!aPre.length && !bPre.length) return 0
+  if (!aPre.length) return 1
+  if (!bPre.length) return -1
+  const len = Math.max(aPre.length, bPre.length)
+  for (let i = 0; i < len; i++) {
+    if (aPre[i] === undefined) return -1
+    if (bPre[i] === undefined) return 1
+    const cmp = compareIdentifier(aPre[i], bPre[i])
+    if (cmp !== 0) return cmp
+  }
+  return 0
+}
+
+export function updateConfig(config = {}) {
+  return {
+    enabled: config.update?.enabled !== false,
+    notifyOnStartup: config.update?.notify_on_startup !== false,
+    autoInstall: Boolean(config.update?.auto_install),
+    channel: config.update?.channel || "latest",
+    checkIntervalHours: Number(config.update?.check_interval_hours ?? 12),
+    registry: config.update?.registry || DEFAULT_REGISTRY,
+    timeoutMs: Number(config.update?.timeout_ms ?? DEFAULT_TIMEOUT_MS)
+  }
+}
+
+async function readUpdateState(file = updateStatePath()) {
+  try {
+    return JSON.parse(await readFile(file, "utf8"))
+  } catch {
+    return {}
+  }
+}
+
+async function writeUpdateState(state, file = updateStatePath()) {
+  await mkdir(dirname(file), { recursive: true })
+  await writeFile(file, `${JSON.stringify(state, null, 2)}\n`)
+}
+
+export async function fetchPackageMetadata({ packageName = PACKAGE_NAME, registry = DEFAULT_REGISTRY, timeoutMs = DEFAULT_TIMEOUT_MS, fetchImpl = globalThis.fetch } = {}) {
+  if (typeof fetchImpl !== "function") throw new Error("fetch is unavailable in this Node runtime")
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), Math.max(100, Number(timeoutMs || DEFAULT_TIMEOUT_MS)))
+  try {
+    const url = `${normalizeRegistry(registry)}/${encodePackageName(packageName)}`
+    const res = await fetchImpl(url, {
+      headers: { accept: "application/vnd.npm.install-v1+json, application/json" },
+      signal: controller.signal
+    })
+    if (!res.ok) throw new Error(`npm registry returned HTTP ${res.status}`)
+    return await res.json()
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+export async function checkForUpdate(config = {}, options = {}) {
+  const cfg = updateConfig(config)
+  if (!cfg.enabled && !options.force) return { ok: false, skipped: true, reason: "disabled" }
+
+  const now = Number(options.now ?? Date.now())
+  const stateFile = options.stateFile || updateStatePath()
+  const state = options.state ?? await readUpdateState(stateFile)
+  const intervalMs = Math.max(0, cfg.checkIntervalHours) * 60 * 60 * 1000
+  if (!options.force && intervalMs > 0 && state.checkedAt && now - Date.parse(state.checkedAt) < intervalMs) {
+    return { ok: true, skipped: true, reason: "interval", state }
+  }
+
+  const metadata = await fetchPackageMetadata({
+    packageName: options.packageName || PACKAGE_NAME,
+    registry: cfg.registry,
+    timeoutMs: cfg.timeoutMs,
+    fetchImpl: options.fetchImpl
+  })
+  const distTags = metadata["dist-tags"] || {}
+  const latestVersion = distTags[cfg.channel] || distTags.latest || metadata.version
+  const currentVersion = options.currentVersion || PACKAGE_VERSION
+  const hasUpdate = Boolean(latestVersion && compareVersions(latestVersion, currentVersion) > 0)
+  const result = {
+    ok: true,
+    packageName: options.packageName || PACKAGE_NAME,
+    channel: cfg.channel,
+    currentVersion,
+    latestVersion,
+    hasUpdate,
+    installSpec: `${options.packageName || PACKAGE_NAME}@${cfg.channel}`,
+    checkedAt: new Date(now).toISOString()
+  }
+  await writeUpdateState(result, stateFile)
+  return result
+}
+
+export function updateMessage(result) {
+  if (!result?.hasUpdate) return null
+  return `Update available: kkcode ${result.currentVersion} -> ${result.latestVersion} (${result.channel}). Run: kkcode update --channel ${result.channel}`
+}
+
+export async function maybeNotifyUpdateOnStartup(config = {}, options = {}) {
+  const cfg = updateConfig(config)
+  if (!cfg.enabled || !cfg.notifyOnStartup || process.env.KKCODE_DISABLE_UPDATE_CHECK === "1") return null
+  try {
+    const result = await checkForUpdate(config, options)
+    const message = updateMessage(result)
+    if (message) {
+      const print = options.print || console.error
+      print(message)
+      if (cfg.autoInstall) {
+        const install = await installUpdate(config, { channel: result.channel, stdio: "ignore" })
+        if (install.ok) print(`kkcode update installed ${result.latestVersion}; restart kkcode to use it.`)
+        else print(`kkcode auto-update failed: ${install.error}`)
+      }
+    }
+    return result
+  } catch (error) {
+    if (options.verbose) (options.print || console.error)(`kkcode update check failed: ${error.message}`)
+    return { ok: false, error: error.message }
+  }
+}
+
+function runCommand(command, args, { cwd = process.cwd(), env = process.env, stdio = "inherit" } = {}) {
+  return new Promise((resolve) => {
+    const child = spawn(command, args, { cwd, env, stdio, shell: process.platform === "win32" })
+    child.on("exit", (code) => resolve({ ok: code === 0, code }))
+    child.on("error", (error) => resolve({ ok: false, code: 1, error: error.message }))
+  })
+}
+
+export async function installUpdate(config = {}, options = {}) {
+  const cfg = updateConfig(config)
+  const channel = options.channel || cfg.channel || "latest"
+  const packageName = options.packageName || PACKAGE_NAME
+  const npm = options.npmCommand || process.env.npm_execpath || "npm"
+  const args = ["install", "-g", `${packageName}@${channel}`]
+  const result = await (options.runCommand || runCommand)(npm, args, options)
+  if (!result.ok) return { ok: false, code: result.code, error: result.error || `npm exited with ${result.code}` }
+  return { ok: true, command: npm, args }
+}

package/src/usage/pricing.mjs

@@ -1,121 +1,122 @@
-import path from "node:path"
-import { access, readFile } from "node:fs/promises"
-import YAML from "yaml"
-
-const DEFAULT_PRICING = {
-  currency: "USD",
-  per_tokens: 1000000,
-  models: {
-    "claude-opus-4-6": { input: 5, output: 25, cache_read: 0.5, cache_write: 6.25 },
-    "claude-opus-4-5": { input: 5, output: 25, cache_read: 0.5, cache_write: 6.25 },
-    "claude-opus-4-1": { input: 15, output: 75, cache_read: 1.5, cache_write: 18.75 },
-    "claude-opus-4": { input: 15, output: 75, cache_read: 1.5, cache_write: 18.75 },
-    "claude-sonnet-4-6": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
-    "claude-sonnet-4-5": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
-    "claude-sonnet-4": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
-    "claude-haiku-4-5": { input: 1, output: 5, cache_read: 0.1, cache_write: 1.25 },
-    "claude-haiku-3-5": { input: 0.8, output: 4, cache_read: 0.08, cache_write: 1 },
-    "gpt-5.3-codex": { input: 15, output: 60, cache_read: 7.5, cache_write: 15 },
-    "gpt-4o": { input: 2.5, output: 10, cache_read: 1.25, cache_write: 2.5 },
-    "gpt-4o-mini": { input: 0.15, output: 0.6, cache_read: 0.075, cache_write: 0.15 },
-    "deepseek-chat": { input: 0.27, output: 1.1, cache_read: 0.07, cache_write: 0.27 },
-    "deepseek-coder": { input: 0.27, output: 1.1, cache_read: 0.07, cache_write: 0.27 },
-    "deepseek-v3.1-terminus": { input: 0.55, output: 1.65, cache_read: 0.07, cache_write: 0.55 },
-    "deepseek-v3.2": { input: 0.28, output: 0.41, cache_read: 0.03, cache_write: 0.28 },
-    "kimi-k2.5": { input: 0.55, output: 2.9, cache_read: 0, cache_write: 0 },
-    "kimi-k2-0905": { input: 0.55, output: 2.2, cache_read: 0.14, cache_write: 0 },
-    "qwen-plus": { input: 0.11, output: 1.11, cache_read: 0.02, cache_write: 0 },
-    "qwen-max": { input: 0.33, output: 1.33, cache_read: 0.07, cache_write: 0 },
-    "qwen-turbo": { input: 0.04, output: 0.08, cache_read: 0.01, cache_write: 0 },
-    "qwen3-coder-plus": { input: 0.55, output: 2.2, cache_read: 0.11, cache_write: 0 },
-    "qwen3-coder-flash": { input: 0.14, output: 0.55, cache_read: 0.03, cache_write: 0 },
-    "qwen3-coder-480b-a35b": { input: 0.83, output: 3.3, cache_read: 0.17, cache_write: 0 },
-    "doubao-seed-2.0-code": { input: 0.44, output: 2.2, cache_read: 0, cache_write: 0 },
-    "doubao-seed-2.0-pro": { input: 0.44, output: 2.2, cache_read: 0, cache_write: 0 },
-    "doubao-seed-1.8": { input: 0.11, output: 1.1, cache_read: 0, cache_write: 0 },
-    "doubao-seed-code": { input: 0.17, output: 1.1, cache_read: 0, cache_write: 0 },
-    "minimax-m2.5": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
-    "minimax-m2.5-highspeed": { input: 0.58, output: 2.32, cache_read: 0.03, cache_write: 0 },
-    "minimax-m2.1": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
-    "minimax-m2": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
-    "glm-5": { input: 0.55, output: 3.05, cache_read: 0, cache_write: 0 },
-    "glm-4.7": { input: 0.41, output: 1.93, cache_read: 0, cache_write: 0 },
-    "glm-4.6": { input: 0.28, output: 1.1, cache_read: 0, cache_write: 0 }
-  },
-  default: {
-    input: 3,
-    output: 15,
-    cache_read: 0.3,
-    cache_write: 3.75
-  }
-}
-
-async function exists(file) {
-  try {
-    await access(file)
-    return true
-  } catch {
-    return false
-  }
-}
-
-function parse(file, raw) {
-  if (file.endsWith(".json")) return JSON.parse(raw)
-  return YAML.parse(raw)
-}
-
-function resolvePricingPath(configState) {
-  const projectPath = configState.source.projectRaw?.usage?.pricing_file
-  if (typeof projectPath === "string" && projectPath.trim()) {
-    return path.resolve(configState.source.projectDir ?? process.cwd(), projectPath)
-  }
-  const userPath = configState.source.userRaw?.usage?.pricing_file
-  if (typeof userPath === "string" && userPath.trim()) {
-    return path.resolve(configState.source.userDir ?? process.cwd(), userPath)
-  }
-  return null
-}
-
-export async function loadPricing(configState) {
-  const file = resolvePricingPath(configState)
-  if (!file || !(await exists(file))) {
-    return { pricing: DEFAULT_PRICING, source: "default", errors: [] }
-  }
-  try {
-    const raw = await readFile(file, "utf8")
-    const parsed = parse(file, raw)
-    const pricing = {
-      ...DEFAULT_PRICING,
-      ...parsed,
-      default: { ...DEFAULT_PRICING.default, ...(parsed.default ?? {}) }
-    }
-    return { pricing, source: file, errors: [] }
-  } catch (error) {
-    return { pricing: DEFAULT_PRICING, source: "default", errors: [`${file}: ${error.message}`] }
-  }
-}
-
-function findPricingEntry(models, model) {
-  if (models[model]) return models[model]
-  // Fuzzy: try prefix match (e.g. "claude-opus-4-6-20250601" → "claude-opus-4-6")
-  const m = String(model).toLowerCase()
-  for (const key of Object.keys(models)) {
-    if (m.startsWith(key)) return models[key]
-  }
-  return null
-}
-
-export function calculateCost(pricing, model, usage) {
-  const entry = findPricingEntry(pricing.models, model) ?? pricing.default
-  const per = pricing.per_tokens || 1000000
-  // All providers normalize input to non-cached tokens only (see provider/*.mjs)
-  const amount =
-    ((usage.input || 0) * (entry.input || 0) +
-      (usage.output || 0) * (entry.output || 0) +
-      (usage.cacheRead || 0) * (entry.cache_read || 0) +
-      (usage.cacheWrite || 0) * (entry.cache_write || 0)) /
-    per
-  const savings = ((usage.cacheRead || 0) * ((entry.input || 0) - (entry.cache_read || 0))) / per
-  const unknown = !findPricingEntry(pricing.models, model)
-  return { amount, savings, unknown, currency: pricing.currency }
-}
+import path from "node:path"
+import { access, readFile } from "node:fs/promises"
+import YAML from "yaml"
+
+const DEFAULT_PRICING = {
+  currency: "USD",
+  per_tokens: 1000000,
+  models: {
+    "claude-opus-4-6": { input: 5, output: 25, cache_read: 0.5, cache_write: 6.25 },
+    "claude-opus-4-5": { input: 5, output: 25, cache_read: 0.5, cache_write: 6.25 },
+    "claude-opus-4-1": { input: 15, output: 75, cache_read: 1.5, cache_write: 18.75 },
+    "claude-opus-4": { input: 15, output: 75, cache_read: 1.5, cache_write: 18.75 },
+    "claude-sonnet-4-6": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
+    "claude-sonnet-4-5": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
+    "claude-sonnet-4": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
+    "claude-haiku-4-5": { input: 1, output: 5, cache_read: 0.1, cache_write: 1.25 },
+    "claude-haiku-3-5": { input: 0.8, output: 4, cache_read: 0.08, cache_write: 1 },
+    "gpt-5.3-codex": { input: 15, output: 60, cache_read: 7.5, cache_write: 15 },
+    "gpt-4o": { input: 2.5, output: 10, cache_read: 1.25, cache_write: 2.5 },
+    "gpt-4o-mini": { input: 0.15, output: 0.6, cache_read: 0.075, cache_write: 0.15 },
+    "deepseek-chat": { input: 0.27, output: 1.1, cache_read: 0.07, cache_write: 0.27 },
+    "deepseek-coder": { input: 0.27, output: 1.1, cache_read: 0.07, cache_write: 0.27 },
+    "deepseek-v3.1-terminus": { input: 0.55, output: 1.65, cache_read: 0.07, cache_write: 0.55 },
+    "deepseek-v3.2": { input: 0.28, output: 0.41, cache_read: 0.03, cache_write: 0.28 },
+    "kimi-k2.5": { input: 0.55, output: 2.9, cache_read: 0, cache_write: 0 },
+    "kimi-k2-0905": { input: 0.55, output: 2.2, cache_read: 0.14, cache_write: 0 },
+    "qwen-plus": { input: 0.11, output: 1.11, cache_read: 0.02, cache_write: 0 },
+    "qwen-max": { input: 0.33, output: 1.33, cache_read: 0.07, cache_write: 0 },
+    "qwen-turbo": { input: 0.04, output: 0.08, cache_read: 0.01, cache_write: 0 },
+    "qwen3-coder-plus": { input: 0.55, output: 2.2, cache_read: 0.11, cache_write: 0 },
+    "qwen3-coder-flash": { input: 0.14, output: 0.55, cache_read: 0.03, cache_write: 0 },
+    "qwen3-coder-480b-a35b": { input: 0.83, output: 3.3, cache_read: 0.17, cache_write: 0 },
+    "doubao-seed-2.0-code": { input: 0.44, output: 2.2, cache_read: 0, cache_write: 0 },
+    "doubao-seed-2.0-pro": { input: 0.44, output: 2.2, cache_read: 0, cache_write: 0 },
+    "doubao-seed-1.8": { input: 0.11, output: 1.1, cache_read: 0, cache_write: 0 },
+    "doubao-seed-code": { input: 0.17, output: 1.1, cache_read: 0, cache_write: 0 },
+    "minimax-m2.5": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
+    "minimax-m2.5-highspeed": { input: 0.58, output: 2.32, cache_read: 0.03, cache_write: 0 },
+    "minimax-m2.1": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
+    "minimax-m2": { input: 0.29, output: 1.16, cache_read: 0.03, cache_write: 0 },
+    "glm-5": { input: 0.55, output: 3.05, cache_read: 0, cache_write: 0 },
+    "glm-4.7": { input: 0.41, output: 1.93, cache_read: 0, cache_write: 0 },
+    "glm-4.6": { input: 0.28, output: 1.1, cache_read: 0, cache_write: 0 }
+  },
+  default: {
+    input: 3,
+    output: 15,
+    cache_read: 0.3,
+    cache_write: 3.75
+  }
+}
+
+async function exists(file) {
+  try {
+    await access(file)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function parse(file, raw) {
+  if (file.endsWith(".json")) return JSON.parse(raw)
+  return YAML.parse(raw)
+}
+
+function resolvePricingPath(configState) {
+  const projectPath = configState.source.projectRaw?.usage?.pricing_file
+  if (typeof projectPath === "string" && projectPath.trim()) {
+    return path.resolve(configState.source.projectDir ?? process.cwd(), projectPath)
+  }
+  const userPath = configState.source.userRaw?.usage?.pricing_file
+  if (typeof userPath === "string" && userPath.trim()) {
+    return path.resolve(configState.source.userDir ?? process.cwd(), userPath)
+  }
+  return null
+}
+
+export async function loadPricing(configState) {
+  const file = resolvePricingPath(configState)
+  if (!file || !(await exists(file))) {
+    return { pricing: DEFAULT_PRICING, source: "default", errors: [] }
+  }
+  try {
+    const raw = await readFile(file, "utf8")
+    const parsed = parse(file, raw)
+    const pricing = {
+      ...DEFAULT_PRICING,
+      ...parsed,
+      models: { ...DEFAULT_PRICING.models, ...(parsed.models ?? {}) },
+      default: { ...DEFAULT_PRICING.default, ...(parsed.default ?? {}) }
+    }
+    return { pricing, source: file, errors: [] }
+  } catch (error) {
+    return { pricing: DEFAULT_PRICING, source: "default", errors: [`${file}: ${error.message}`] }
+  }
+}
+
+function findPricingEntry(models, model) {
+  if (models[model]) return models[model]
+  // Fuzzy: try prefix match (e.g. "claude-opus-4-6-20250601" → "claude-opus-4-6")
+  const m = String(model).toLowerCase()
+  for (const key of Object.keys(models)) {
+    if (m.startsWith(key)) return models[key]
+  }
+  return null
+}
+
+export function calculateCost(pricing, model, usage) {
+  const entry = findPricingEntry(pricing.models, model) ?? pricing.default
+  const per = pricing.per_tokens || 1000000
+  // All providers normalize input to non-cached tokens only (see provider/*.mjs)
+  const amount =
+    ((usage.input || 0) * (entry.input || 0) +
+      (usage.output || 0) * (entry.output || 0) +
+      (usage.cacheRead || 0) * (entry.cache_read || 0) +
+      (usage.cacheWrite || 0) * (entry.cache_write || 0)) /
+    per
+  const savings = ((usage.cacheRead || 0) * ((entry.input || 0) - (entry.cache_read || 0))) / per
+  const unknown = !findPricingEntry(pricing.models, model)
+  return { amount, savings, unknown, currency: pricing.currency }
+}

package/src/usage/usage-meter.mjs

@@ -80,6 +80,7 @@ export async function resetUsage(sessionId = null) {
     return
   }
   const store = await readUsageStore()
+  maybeRotateGlobal(store)
   delete store.sessions[sessionId]
   store.global = emptyUsage()
   for (const session of Object.values(store.sessions)) {