krasavacode 0.3.3 → 0.3.5

package/bin/krasavacode.js

@@ -8,7 +8,7 @@ import { runDoctor } from '../src/doctor.js';
 import { runSetupGemini } from '../src/setup-gemini.js';
 
 // Hardcoded so it works inside Bun --compile (no FS access to package.json)
-const VERSION = '0.3.3';
+const VERSION = '0.3.5';
 
 const cmd = process.argv[2];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "krasavacode",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "KRASAVACODE — однокнопочный бесплатный вайбкодинг для учеников. Claude Code на бесплатных провайдерах через локальный gateway. Сам ставит Node при необходимости.",
   "type": "module",
   "bin": {

package/src/hub.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import { setTimeout as sleep } from 'node:timers/promises';
 import { CCR_PORT } from './preset.js';
 import { loadGeminiKey } from './setup-gemini.js';
+import { startMetricsProxy } from './metrics-proxy.js';
 
 const HOST = '127.0.0.1';
 const PORT = CCR_PORT;
@@ -88,11 +89,24 @@ export async function startHub(paths) {
     }
   }
 
-  return { process: child, port: PORT, baseUrl, ownedByUs: true };
+  // Front the ccr endpoint with our metrics-counting proxy. Claude Code
+  // talks to the proxy; the proxy forwards to ccr; we count requests and
+  // translate 429 errors into friendly Russian messages.
+  const metrics = await startMetricsProxy(baseUrl);
+
+  return {
+    process: child,
+    port: PORT,
+    ccrBaseUrl: baseUrl,
+    baseUrl: metrics.baseUrl, // <-- Claude Code будет ходить сюда
+    metrics,
+    ownedByUs: true,
+  };
 }
 
 export async function stopHub(hub) {
   if (!hub) return;
+  if (hub.metrics) await hub.metrics.stop().catch(() => {});
   if (!hub.ownedByUs) return; // we didn't start it; leave it running for the user
   if (!hub.process || hub.process.killed) return;
 

package/src/launch.js

@@ -3,6 +3,7 @@ import { mkdir } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { isGeminiConfigured } from './setup-gemini.js';
+import { getQuotaInfo } from './metrics-proxy.js';
 
 const PLACEHOLDER_TOKEN = 'sk-krasavacode-local';
 const CLAUDE_CONFIG_DIR = join(homedir(), '.krasavacode', 'claude-config');
@@ -15,18 +16,21 @@ export async function launchClaude(paths, hub /*, detection */) {
   // Organization · API Usage Billing" header on the welcome screen.
   await mkdir(CLAUDE_CONFIG_DIR, { recursive: true });
 
-  // Drop any pre-existing ANTHROPIC_API_KEY (from the user's shell or a real
-  // Anthropic login) so it doesn't conflict with our auth-token, and so that
-  // Claude Code's welcome screen doesn't show the user's real Anthropic org.
+  // Drop any pre-existing Anthropic creds from the shell/Keychain so the
+  // welcome screen doesn't greet the student with the real Anthropic owner's
+  // name and "API Usage Billing".
   const cleanEnv = { ...process.env };
   delete cleanEnv.ANTHROPIC_API_KEY;
+  delete cleanEnv.ANTHROPIC_AUTH_TOKEN;
   delete cleanEnv.ANTHROPIC_VERTEX_PROJECT_ID;
   delete cleanEnv.ANTHROPIC_BEDROCK_BASE_URL;
 
   const env = {
     ...cleanEnv,
     ANTHROPIC_BASE_URL: hub.baseUrl,
-    ANTHROPIC_AUTH_TOKEN: PLACEHOLDER_TOKEN,
+    // --bare mode requires ANTHROPIC_API_KEY (OAuth token is ignored).
+    // Our proxy doesn't actually validate this — any non-empty value works.
+    ANTHROPIC_API_KEY: PLACEHOLDER_TOKEN,
     // Isolate config/credentials: own dir, separate from ~/.claude/
     ANTHROPIC_CONFIG_DIR: CLAUDE_CONFIG_DIR,
     DISABLE_AUTOUPDATER: '1',
@@ -37,13 +41,21 @@ export async function launchClaude(paths, hub /*, detection */) {
     ANTHROPIC_MODEL: process.env.ANTHROPIC_MODEL || 'claude-sonnet-4-5',
   };
 
-  const passthroughArgs = process.argv.slice(2).filter(a => !['doctor', 'upgrade'].includes(a));
+  // --bare mode: skips Keychain reads, plugin sync, auto-memory, attribution,
+  // CLAUDE.md auto-discovery — i.e. everything that would leak the user's
+  // real Anthropic identity into the welcome screen.
+  // Set KRASAVACODE_BARE=0 to disable for debugging.
+  const useBare = process.env.KRASAVACODE_BARE !== '0';
+  const passthroughArgs = process.argv.slice(2)
+    .filter(a => !['doctor', 'upgrade', 'setup-gemini', 'gemini'].includes(a));
+  if (useBare && !passthroughArgs.includes('--bare')) passthroughArgs.unshift('--bare');
 
   const W = 64;
   const line = (txt) => {
     const pad = Math.max(0, W - 2 - [...txt].length);
     return '┃ ' + txt + ' '.repeat(pad) + '┃';
   };
+  const quota = await getQuotaInfo();
   console.log('');
   console.log('┏' + '━'.repeat(W - 1) + '┓');
   console.log(line('  K R A S A V A C O D E'));
@@ -51,10 +63,19 @@ export async function launchClaude(paths, hub /*, detection */) {
   console.log('┣' + '━'.repeat(W - 1) + '┫');
   if (geminiOn) {
     console.log(line('  ✓ Модель: Google Gemini 2.5 Flash'));
-    console.log(line('    (1500 запросов в день, бесплатно)'));
+    const left = quota.perDay - quota.used;
+    if (left > 100) {
+      console.log(line(`    Сегодня осталось: ${left} из ${quota.perDay} запросов`));
+    } else if (left > 0) {
+      console.log(line(`  ⚠️  Осталось ${left} из ${quota.perDay} — обнулится завтра`));
+    } else {
+      console.log(line(`  ❌ Лимит на сегодня исчерпан (${quota.used} из ${quota.perDay})`));
+      console.log(line(`     Обнулится в ~21:00 МСК`));
+    }
   } else {
     console.log(line('  · Модель: gpt-oss-20b через Pollinations'));
     console.log(line('    (бесплатно, без логина)'));
+    console.log(line(`    Сегодня сделал ${quota.used} запросов`));
     console.log(line('  💡 Лучше модель: krasavacode setup-gemini'));
   }
   console.log('┗' + '━'.repeat(W - 1) + '┛');

package/src/metrics-proxy.js

@@ -0,0 +1,147 @@
+import http from 'node:http';
+import net from 'node:net';
+import { readFile, writeFile, mkdir, access } from 'node:fs/promises';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { isGeminiConfigured } from './setup-gemini.js';
+
+const ROOT = join(homedir(), '.krasavacode');
+const USAGE_FILE = join(ROOT, 'usage.json');
+
+const FREE_QUOTA = {
+  gemini: { perDay: 1500, label: 'Google Gemini 2.5 Flash (free tier)' },
+  pollinations: { perDay: null, label: 'Pollinations (free)' },
+};
+
+function todayKey() {
+  return new Date().toISOString().slice(0, 10);
+}
+
+async function readUsage() {
+  try { return JSON.parse(await readFile(USAGE_FILE, 'utf8')); }
+  catch { return {}; }
+}
+
+async function writeUsage(u) {
+  await mkdir(ROOT, { recursive: true });
+  await writeFile(USAGE_FILE, JSON.stringify(u, null, 2));
+}
+
+async function bump() {
+  const u = await readUsage();
+  const day = todayKey();
+  u[day] = (u[day] || 0) + 1;
+  u.lastRequestAt = new Date().toISOString();
+  // keep only last 30 days
+  for (const k of Object.keys(u)) {
+    if (/^\d{4}-\d{2}-\d{2}$/.test(k)) {
+      const age = (Date.now() - new Date(k).getTime()) / 86400000;
+      if (age > 30) delete u[k];
+    }
+  }
+  await writeUsage(u);
+}
+
+export async function getTodayUsage() {
+  const u = await readUsage();
+  return u[todayKey()] || 0;
+}
+
+export async function getQuotaInfo() {
+  const provider = (await isGeminiConfigured()) ? 'gemini' : 'pollinations';
+  const used = await getTodayUsage();
+  const { perDay, label } = FREE_QUOTA[provider];
+  return { provider, used, perDay, label, remaining: perDay ? Math.max(0, perDay - used) : null };
+}
+
+function getFreePort() {
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer();
+    srv.unref();
+    srv.on('error', reject);
+    srv.listen(0, '127.0.0.1', () => {
+      const { port } = srv.address();
+      srv.close(() => resolve(port));
+    });
+  });
+}
+
+const FRIENDLY_429 = (provider, used) => ({
+  type: 'error',
+  error: {
+    type: 'rate_limit_error',
+    message:
+      provider === 'gemini'
+        ? `Закончились бесплатные запросы Google Gemini на сегодня (использовано ${used} из 1500).\n\n` +
+          `Квота обнулится в ~10:00 PT (~21:00 МСК).\n\n` +
+          `Что делать сейчас:\n` +
+          `  • Подожди до завтра, и продолжи\n` +
+          `  • Или подключи второй Google-аккаунт через krasavacode setup-gemini\n` +
+          `  • Или временно вернись на Pollinations: удали ~/.krasavacode/gemini.env`
+        : `Pollinations на минуту перегружен. Подожди ~30 секунд и нажми Enter ещё раз.\n` +
+          `Или подключи Gemini для стабильности: krasavacode setup-gemini`,
+  },
+});
+
+/**
+ * Proxy: Claude Code → metrics-proxy (this) → ccr → upstream.
+ *
+ * - Counts every successful POST /v1/messages as one request, written to ~/.krasavacode/usage.json
+ * - Replaces 429 responses with a friendly Russian message
+ * - Streams everything else through unmodified (so SSE works)
+ */
+export async function startMetricsProxy(upstreamBaseUrl) {
+  const upstream = new URL(upstreamBaseUrl);
+  const port = await getFreePort();
+
+  const debug = process.env.KRASAVACODE_DEBUG === '1';
+  const server = http.createServer((req, res) => {
+    const path = (req.url || '').split('?')[0];
+    const isMessages = req.method === 'POST' && path === '/v1/messages';
+    if (debug) console.error(`[metrics] ${req.method} ${req.url}`);
+
+    const proxyReq = http.request({
+      hostname: upstream.hostname,
+      port: upstream.port,
+      path: req.url,
+      method: req.method,
+      headers: req.headers,
+    }, async (upRes) => {
+      if (debug) console.error(`[metrics] ← ${upRes.statusCode} ${req.url}`);
+      // Treat any 2xx on /v1/messages as one billable request — count immediately.
+      if (isMessages && upRes.statusCode >= 200 && upRes.statusCode < 300) {
+        bump().catch(e => debug && console.error('[metrics] bump fail', e));
+      }
+
+      // 429: try to replace body with a friendly message (non-streaming).
+      // If body is streaming/SSE we still let it through — Claude Code shows it.
+      if (upRes.statusCode === 429 && !/text\/event-stream/.test(upRes.headers['content-type'] || '')) {
+        const used = await getTodayUsage();
+        const provider = (await isGeminiConfigured()) ? 'gemini' : 'pollinations';
+        const body = JSON.stringify(FRIENDLY_429(provider, used));
+        const headers = { ...upRes.headers, 'content-type': 'application/json' };
+        delete headers['content-length'];
+        delete headers['content-encoding'];
+        res.writeHead(429, headers);
+        upRes.resume(); // drain the original
+        res.end(body);
+        return;
+      }
+
+      res.writeHead(upRes.statusCode, upRes.headers);
+      upRes.pipe(res);
+    });
+
+    proxyReq.on('error', (err) => {
+      res.writeHead(502, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: { type: 'upstream_error', message: err.message } }));
+    });
+
+    req.pipe(proxyReq);
+  });
+
+  await new Promise(r => server.listen(port, '127.0.0.1', r));
+
+  const baseUrl = `http://127.0.0.1:${port}`;
+  return { server, port, baseUrl, stop: () => new Promise(r => server.close(r)) };
+}