tokenwait 0.1.2 → 0.1.4

package/bin/tokenwait.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 'use strict';
 // TokenWait CLI.
-//   npx tokenwait install [--agents claude,codex,gemini] [--server URL] [--yes] [--no-login]
+//   npx tokenwait install [--agents claude,codex,gemini] [--server URL] [--yes] [--no-login] [--ide all|none]
+//   npx tokenwait ide [--list] [--yes]   дополнение TokenWait для VS Code / Cursor / JetBrains IDE: поставить или обновить
+//   npx tokenwait update                  обновить хуки агентов и уже поставленные дополнения IDE
 //   tokenwait uninstall [--purge]
 //   tokenwait login | logout | status [--json]
 //   tokenwait link-start --json | me --json | sync     (для расширений IDE)
@@ -14,6 +16,7 @@ const { spawn } = require('child_process');
 const util = require('../lib/util');
 const agents = require('../lib/agents');
 const api = require('../lib/api');
+const ide = require('../lib/ide');
 const worker = require('../lib/worker');
 const { pick } = require('../lib/rotation');
 
@@ -81,7 +84,8 @@ What it changes:
   • stores ads, counters and an install key in ~/.tokenwait
 What it never does:
   • read your code, prompts, responses or transcripts
-  • send anything except ad ids, impression counts, waiting time and the install key
+  • send anything except ad ids, impression counts, waiting time, the install key,
+    the package version and which agents and IDE add-ons are connected
 Undo at any time: npx tokenwait uninstall
 `;
 
@@ -91,6 +95,7 @@ async function cmdInstall() {
   if (!flag('yes')) {
     console.log(CONSENT);
     console.log('Agents: ' + ids.map((id) => agents.AGENTS[id].name).join(', ') + '\n');
+    if (ids.includes('codex')) console.log('⚠ ' + agents.codexNote() + '\n');
     const a = await ask('Install TokenWait? [y/N] ');
     if (!/^y(es)?$/i.test(a)) return console.log('Cancelled. Nothing was changed.');
   }
@@ -108,7 +113,7 @@ async function cmdInstall() {
       const r = agents.install(id, node, app);
       results.push({ agent: id, ok: true, file: r.file });
       if (!json) console.log(`✓ ${agents.AGENTS[id].name}: ${r.file}`);
-      if (!json && agents.AGENTS[id].note) console.log('  ' + agents.AGENTS[id].note);
+      if (!json && id === 'codex') console.log('  ⚠ ' + agents.codexNote());
     } catch (e) {
       results.push({ agent: id, ok: false, error: e.message });
       if (!json) console.log(`✗ ${agents.AGENTS[id].name}: ${e.message}`);
@@ -119,14 +124,119 @@ async function cmdInstall() {
   } catch (e) {
     if (!json) console.log('Could not reach the server yet (' + e.message + '). Ads will load automatically later.');
   }
+  // дополнения для IDE: спрашиваем в обычной установке; при --yes (так зовут установщик сами плагины) — только с --ide all
+  let ideResults = [];
+  const ideOpt = opt('ide');
+  if (ideOpt !== 'none' && !json && (!flag('yes') || ideOpt === 'all')) ideResults = await offerIde(!flag('yes'));
   if (json) return out({ ok: results.every((r) => r.ok), agents: results });
   console.log('\nRestart your agent sessions to pick up the changes.');
+  if (ideResults.some((r) => r.ok && r.target.kind === 'jetbrains' && (r.action === 'install' || r.action === 'update')))
+    console.log('Restart your JetBrains IDE to load the TokenWait plugin.');
   if (!flag('no-login') && api.credentials()) {
     const a = await ask('Sign in now (GitHub, Google or Apple) so earnings go to your account? [Y/n] ');
     if (!/^n/i.test(a)) await cmdLogin();
   }
 }
 
+// ---------- дополнения для IDE ----------
+
+const ACTION_TEXT = { install: 'installed', update: 'updated', current: 'up to date', 'too-old': 'IDE version too old', skipped: 'not installed' };
+
+function describeTargets(targets) {
+  return targets.map((t) => `${t.name}${t.installed ? ` (TokenWait ${t.installed})` : ''}`).join(', ');
+}
+
+function printIdeResults(results, versions) {
+  for (const r of results) {
+    const want = r.target.kind === 'jetbrains' ? versions.jetbrains : versions.vscode;
+    if (r.ok) console.log(`${r.action === 'current' || r.action === 'skipped' || r.action === 'too-old' ? '·' : '✓'} ${r.target.name}: ${ACTION_TEXT[r.action] || r.action}${r.action === 'install' || r.action === 'update' ? ' ' + want : ''}`);
+    else console.log(`✗ ${r.target.name}: ${r.error}`);
+  }
+}
+
+/** В обычной установке: найти IDE и предложить поставить туда дополнение. */
+async function offerIde(interactive) {
+  const targets = ide.detectAll();
+  if (!targets.length) return [];
+  let versions;
+  try {
+    versions = await ide.latest(api.server());
+  } catch (e) {
+    console.log('\nIDE add-ons: could not reach the server (' + e.message + '). Later: npx tokenwait ide');
+    return [];
+  }
+  const todo = targets.filter((t) => ['install', 'update'].includes(ide.plan(t, versions)));
+  if (!todo.length) return [];
+  console.log('\nFound: ' + describeTargets(todo));
+  console.log('The TokenWait add-on shows the sponsored line in the IDE status bar (for Codex and Gemini too) and lets you sign in from the IDE.');
+  if (interactive) {
+    const a = await ask('Install or update the TokenWait add-on there? [Y/n] ');
+    if (/^n/i.test(a)) {
+      console.log('Skipped. Later: npx tokenwait ide');
+      return [];
+    }
+  }
+  const res = await ide.apply(api.server(), todo, versions);
+  printIdeResults(res, versions);
+  return res;
+}
+
+async function cmdIde() {
+  const targets = ide.detectAll();
+  const versions = await ide.latest(api.server());
+  if (flag('list') || !targets.length) {
+    if (json) return out({ ok: true, latest: versions, ides: targets.map((t) => ({ kind: t.kind, id: t.id, name: t.name, installed: t.installed, action: ide.plan(t, versions) })) });
+    if (!targets.length) return console.log('No supported IDE found (VS Code, Cursor, Windsurf, VSCodium, JetBrains IDEs).');
+    console.log(`Latest: VS Code add-on ${versions.vscode}, JetBrains plugin ${versions.jetbrains}`);
+    const LIST_TEXT = { install: 'can be installed', update: 'update available', current: 'up to date', 'too-old': 'IDE version too old' };
+    for (const t of targets) console.log(`  ${t.name.padEnd(26)} ${(t.installed ? 'TokenWait ' + t.installed : 'not installed').padEnd(18)} ${LIST_TEXT[ide.plan(t, versions)]}`);
+    return;
+  }
+  const todo = targets.filter((t) => ['install', 'update'].includes(ide.plan(t, versions)));
+  if (!todo.length) {
+    if (json) return out({ ok: true, results: [] });
+    return console.log('TokenWait add-ons are up to date in: ' + targets.map((t) => t.name).join(', '));
+  }
+  if (!flag('yes') && !json) {
+    console.log('Will install or update the TokenWait add-on in: ' + describeTargets(todo));
+    console.log(`Files come from ${api.server()}/downloads.`);
+    const a = await ask('Continue? [Y/n] ');
+    if (/^n/i.test(a)) return console.log('Cancelled. Nothing was changed.');
+  }
+  const res = await ide.apply(api.server(), todo, versions);
+  if (json) return out({ ok: res.every((r) => r.ok), results: res.map((r) => ({ name: r.target.name, action: r.action, ok: r.ok, error: r.error })) });
+  printIdeResults(res, versions);
+  if (res.some((r) => r.ok && r.target.kind === 'jetbrains')) console.log('Restart your JetBrains IDE to load the new plugin.');
+  if (res.some((r) => r.ok && r.target.kind === 'vscode')) console.log('Reload VS Code windows (Developer: Reload Window) to start the new version.');
+}
+
+/** Обновить: копию пакета, хуки уже подключённых агентов и уже поставленные дополнения IDE. */
+async function cmdUpdate() {
+  const ids = Object.keys(agents.AGENTS).filter((id) => agents.isInstalled(id));
+  if (!ids.length && !json) console.log('TokenWait is not installed for any agent yet. Run: npx tokenwait install');
+  const app = copyApp();
+  for (const id of ids) {
+    try {
+      agents.install(id, process.execPath, app);
+      if (!json) console.log(`✓ ${agents.AGENTS[id].name}: hooks updated (TokenWait ${VERSION})`);
+    } catch (e) {
+      if (!json) console.log(`✗ ${agents.AGENTS[id].name}: ${e.message}`);
+    }
+  }
+  let res = [];
+  let versions = null;
+  try {
+    versions = await ide.latest(api.server());
+    res = await ide.apply(api.server(), ide.detectAll(), versions, { onlyInstalled: true });
+  } catch (e) {
+    if (!json) console.log('IDE add-ons: ' + e.message);
+  }
+  if (json) return out({ ok: res.every((r) => r.ok), version: VERSION, latest: versions, ide: res.map((r) => ({ name: r.target.name, action: r.action, ok: r.ok, error: r.error })) });
+  if (versions) printIdeResults(res.filter((r) => r.action !== 'skipped'), versions);
+  if (versions && ide.cmpVersion(VERSION, versions.core) < 0) console.log(`\nA newer package is available (${versions.core}). Run: npx tokenwait@latest update`);
+  if (res.some((r) => r.ok && r.target.kind === 'jetbrains' && r.action === 'update')) console.log('Restart your JetBrains IDE to load the new plugin.');
+}
+
 async function cmdUninstall() {
   const res = [];
   for (const id of Object.keys(agents.AGENTS)) {
@@ -211,10 +321,12 @@ function help() {
   npx tokenwait install     set up Claude Code / Codex CLI / Gemini CLI
   npx tokenwait login       link this machine to your account (GitHub, Google or Apple)
   npx tokenwait status      what is installed, impressions and earnings
+  npx tokenwait ide         install or update the add-on for VS Code, Cursor and JetBrains IDEs
+  npx tokenwait update      update agent hooks and installed IDE add-ons
   npx tokenwait logout      unlink this machine
   npx tokenwait uninstall   remove everything from agent configs (--purge also deletes ~/.tokenwait)
 
-Options: --agents claude,codex,gemini  --server URL  --yes  --json`);
+Options: --agents claude,codex,gemini  --server URL  --yes  --json  --ide all|none  --list`);
 }
 
 const commands = {
@@ -223,6 +335,8 @@ const commands = {
   login: cmdLogin,
   logout: cmdLogout,
   status: cmdStatus,
+  ide: cmdIde,
+  update: cmdUpdate,
   'link-start': async () => out(await cmdLinkStart()),
   me: async () => out(await api.me()),
   sync: async () => {

package/lib/agents.js

@@ -33,7 +33,7 @@ const AGENTS = {
     file: () => path.join(os.homedir(), '.codex', 'hooks.json'),
     events: { UserPromptSubmit: 'start', Stop: 'stop' },
     statusLine: false,
-    note: 'Codex runs new hooks only after you approve them: start codex and run /hooks once.',
+    note: 'codex', // текст — codexNote(): Codex один раз спрашивает разрешение на хуки
   },
   gemini: {
     name: 'Gemini CLI',
@@ -191,4 +191,23 @@ function restoreLegacySpinner(s) {
   }
 }
 
-module.exports = { AGENTS, detected, install, uninstall, isInstalled, parseStatusLine, HOOK_MARK, _p: p };
+// Codex запускает новые хуки только после одобрения пользователем — предупреждаем заранее, чтобы окно не было неожиданным.
+const CODEX_NOTE = {
+  en: 'Codex will ask once to approve the 2 TokenWait hooks (start and end of a response). Please allow them: in the terminal run /hooks; in the Codex panel of your IDE a hook review window opens: choose “Allow all”. Without this TokenWait cannot see when Codex is thinking, so no ads are shown and nothing is earned for Codex.',
+  ru: 'Codex один раз попросит разрешить 2 хука TokenWait (начало и конец ответа). Разрешите их: в терминале — командой /hooks, в панели Codex в IDE откроется окно «Проверка хуков» — нажмите «Разрешить все». Без этого TokenWait не видит, когда Codex думает: реклама для Codex не показывается и не засчитывается.',
+};
+
+/** Язык системы для сообщений в терминале. */
+function sysLang() {
+  const v = process.env.LC_ALL || process.env.LC_MESSAGES || process.env.LANG || '';
+  if (v) return /^ru/i.test(v) ? 'ru' : 'en';
+  try {
+    return /^ru/i.test(Intl.DateTimeFormat().resolvedOptions().locale) ? 'ru' : 'en';
+  } catch (_) {
+    return 'en';
+  }
+}
+
+const codexNote = (lang = sysLang()) => CODEX_NOTE[lang === 'ru' ? 'ru' : 'en'];
+
+module.exports = { codexNote, sysLang, AGENTS, detected, install, uninstall, isInstalled, parseStatusLine, HOOK_MARK, _p: p };

package/lib/api.js

@@ -24,8 +24,34 @@ function credentials() {
   return c && c.server === server() && c.client_id && c.client_secret ? c : null;
 }
 
-async function request(method, path, body, auth = true, timeoutMs = 5000) {
-  const headers = { accept: 'application/json', 'user-agent': 'tokenwait/' + require('../package.json').version };
+/**
+ * Что стоит на этой установке — для статистики оператора (без данных о человеке):
+ * подключённые агенты и дополнения IDE, которые выходили на связь за последние 7 дней (~/.tokenwait/ide.json).
+ */
+function installInfo() {
+  const out = {};
+  try {
+    const agents = require('./agents');
+    out['x-tokenwait-agents'] = Object.keys(agents.AGENTS).filter((id) => agents.isInstalled(id)).join(',');
+  } catch (_) {}
+  const ide = readJson(p('ide.json'), {});
+  const fresh = Object.entries(ide && typeof ide === 'object' ? ide : {})
+    .filter(([k, v]) => /^(jetbrains|vscode)$/.test(k) && v && Date.now() - Number(v.t) < 7 * 86400_000 && /^\d+\.\d+\.\d+$/.test(String(v.v)))
+    .map(([k, v]) => k + '/' + v.v);
+  out['x-tokenwait-ide'] = fresh.join(',');
+  return out;
+}
+
+/** Отметка дополнения IDE: вызывают JetBrains и VS Code при запуске и раз в час. */
+function markIde(kind, version) {
+  if (!/^(jetbrains|vscode)$/.test(kind)) return;
+  const ide = readJson(p('ide.json'), {});
+  ide[kind] = { v: String(version), t: Date.now() };
+  writeJson(p('ide.json'), ide);
+}
+
+async function request(method, path, body, auth = true, timeoutMs = 5000, extraHeaders = {}) {
+  const headers = { accept: 'application/json', 'user-agent': 'tokenwait/' + require('../package.json').version, ...extraHeaders };
   if (body !== undefined) headers['content-type'] = 'application/json';
   if (auth) {
     const c = credentials() || (await register());
@@ -55,7 +81,7 @@ async function register() {
 }
 
 async function fetchAds() {
-  const r = await request('GET', '/v1/ads');
+  const r = await request('GET', '/v1/ads', undefined, true, 5000, installInfo());
   const data = {
     fetched_at: Date.now(),
     ttl_seconds: Math.min(Math.max(Number(r.ttl_seconds) || 600, 60), 3600),
@@ -76,6 +102,8 @@ async function me() {
 }
 
 module.exports = {
+  installInfo,
+  markIde,
   HttpError,
   server,
   config,

package/lib/ide.js

@@ -0,0 +1,309 @@
+'use strict';
+// Дополнения TokenWait для IDE: найти установленные IDE и поставить или обновить в них дополнение.
+//
+//   VS Code и его сборки (Cursor, Windsurf, VSCodium) — штатной командой `<cli> --install-extension file.vsix --force`.
+//   JetBrains IDE (IDEA, PhpStorm, WebStorm, PyCharm, GoLand, …) — распаковкой плагина в папку плагинов последней
+//   версии каждой IDE; новая версия подхватывается при перезапуске IDE.
+//
+// Файлы берутся с сервера TokenWait: /downloads/versions.json, /downloads/tokenwait-vscode.vsix,
+// /downloads/tokenwait-jetbrains.zip. Без согласия пользователя ничего не ставится (см. bin/tokenwait.js).
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const zlib = require('zlib');
+const { execFileSync } = require('child_process');
+
+const VSIX_ID = 'tokenwait.tokenwait';
+const JB_FOLDER = 'tokenwait';
+
+// ---------- версии ----------
+
+function cmpVersion(a, b) {
+  const pa = String(a || '0').split('.').map((x) => parseInt(x, 10) || 0);
+  const pb = String(b || '0').split('.').map((x) => parseInt(x, 10) || 0);
+  for (let i = 0; i < 3; i++) if ((pa[i] || 0) !== (pb[i] || 0)) return (pa[i] || 0) < (pb[i] || 0) ? -1 : 1;
+  return 0;
+}
+
+// ---------- распаковка zip (без зависимостей) ----------
+
+/** Файлы архива: [{name, data}]. Пути с «..» и абсолютные отбрасываются. */
+function unzip(buf) {
+  let eocd = -1;
+  for (let i = buf.length - 22; i >= Math.max(0, buf.length - 65557); i--) {
+    if (buf.readUInt32LE(i) === 0x06054b50) {
+      eocd = i;
+      break;
+    }
+  }
+  if (eocd < 0) throw new Error('not a zip archive');
+  const count = buf.readUInt16LE(eocd + 10);
+  let off = buf.readUInt32LE(eocd + 16);
+  const files = [];
+  for (let k = 0; k < count; k++) {
+    if (buf.readUInt32LE(off) !== 0x02014b50) throw new Error('broken zip archive');
+    const method = buf.readUInt16LE(off + 10);
+    const csize = buf.readUInt32LE(off + 20);
+    const nlen = buf.readUInt16LE(off + 28);
+    const xlen = buf.readUInt16LE(off + 30);
+    const clen = buf.readUInt16LE(off + 32);
+    const local = buf.readUInt32LE(off + 42);
+    const name = buf.toString('utf8', off + 46, off + 46 + nlen).replace(/\\/g, '/');
+    off += 46 + nlen + xlen + clen;
+    if (name.endsWith('/')) continue;
+    if (name.startsWith('/') || /^[A-Za-z]:/.test(name) || name.split('/').includes('..')) throw new Error('unsafe path in archive: ' + name);
+    if (buf.readUInt32LE(local) !== 0x04034b50) throw new Error('broken zip archive');
+    const start = local + 30 + buf.readUInt16LE(local + 26) + buf.readUInt16LE(local + 28);
+    const raw = buf.subarray(start, start + csize);
+    let data;
+    if (method === 0) data = Buffer.from(raw);
+    else if (method === 8) data = zlib.inflateRawSync(raw);
+    else throw new Error('unsupported zip compression: ' + method);
+    files.push({ name, data });
+  }
+  return files;
+}
+
+// ---------- JetBrains ----------
+
+const JB_PRODUCTS = {
+  IntelliJIdea: 'IntelliJ IDEA',
+  IdeaIC: 'IntelliJ IDEA CE',
+  PhpStorm: 'PhpStorm',
+  WebStorm: 'WebStorm',
+  PyCharm: 'PyCharm',
+  PyCharmCE: 'PyCharm CE',
+  GoLand: 'GoLand',
+  RubyMine: 'RubyMine',
+  CLion: 'CLion',
+  Rider: 'Rider',
+  DataGrip: 'DataGrip',
+  DataSpell: 'DataSpell',
+  RustRover: 'RustRover',
+  Aqua: 'Aqua',
+};
+const JB_DIR = new RegExp(`^(${Object.keys(JB_PRODUCTS).join('|')})(\\d{4})\\.(\\d+)$`);
+
+/** Где лежат настройки и плагины JetBrains IDE на этой ОС. */
+function jbLayout(home = os.homedir(), platform = process.platform, env = process.env) {
+  if (platform === 'darwin') {
+    const base = path.join(home, 'Library', 'Application Support', 'JetBrains');
+    return { config: base, plugins: (dir) => path.join(base, dir, 'plugins') };
+  }
+  if (platform === 'win32') {
+    const base = path.join(env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'JetBrains');
+    return { config: base, plugins: (dir) => path.join(base, dir, 'plugins') };
+  }
+  const config = path.join(env.XDG_CONFIG_HOME || path.join(home, '.config'), 'JetBrains');
+  const data = path.join(env.XDG_DATA_HOME || path.join(home, '.local', 'share'), 'JetBrains');
+  return { config, plugins: (dir) => path.join(data, dir) };
+}
+
+function jbInstalledVersion(pluginsDir) {
+  try {
+    for (const f of fs.readdirSync(path.join(pluginsDir, JB_FOLDER, 'lib'))) {
+      const m = /^tokenwait-(\d+\.\d+\.\d+)\.jar$/.exec(f);
+      if (m) return m[1];
+    }
+  } catch (_) {}
+  return null;
+}
+
+/** Последняя версия каждой JetBrains IDE, которую запускали на этой машине. */
+function detectJetbrains(opts = {}) {
+  const layout = jbLayout(opts.home, opts.platform, opts.env);
+  let dirs = [];
+  try {
+    dirs = fs.readdirSync(layout.config);
+  } catch (_) {
+    return [];
+  }
+  const latest = new Map();
+  for (const dir of dirs) {
+    const m = JB_DIR.exec(dir);
+    if (!m) continue;
+    const year = Number(m[2]);
+    const minor = Number(m[3]);
+    const prev = latest.get(m[1]);
+    if (!prev || year * 100 + minor > prev.year * 100 + prev.minor) latest.set(m[1], { dir, year, minor });
+  }
+  return [...latest.entries()].map(([product, v]) => {
+    const pluginsDir = layout.plugins(v.dir);
+    return {
+      kind: 'jetbrains',
+      id: product,
+      name: `${JB_PRODUCTS[product]} ${v.year}.${v.minor}`,
+      build: (v.year % 100) * 10 + v.minor, // 2024.3 -> 243 (номер ветки, как since-build)
+      pluginsDir,
+      installed: jbInstalledVersion(pluginsDir),
+    };
+  });
+}
+
+/** Распаковать плагин в папку плагинов IDE, заменив прежнюю версию. */
+function installJetbrains(target, zipBuf) {
+  const files = unzip(zipBuf);
+  const top = new Set(files.map((f) => f.name.split('/')[0]));
+  if (top.size !== 1 || !top.has(JB_FOLDER)) throw new Error('unexpected plugin archive layout');
+  fs.mkdirSync(target.pluginsDir, { recursive: true });
+  const tmp = path.join(target.pluginsDir, '.tokenwait-new');
+  fs.rmSync(tmp, { recursive: true, force: true });
+  for (const f of files) {
+    const dst = path.join(tmp, f.name.slice(JB_FOLDER.length + 1));
+    fs.mkdirSync(path.dirname(dst), { recursive: true });
+    fs.writeFileSync(dst, f.data);
+  }
+  const dst = path.join(target.pluginsDir, JB_FOLDER);
+  fs.rmSync(dst, { recursive: true, force: true });
+  fs.renameSync(tmp, dst);
+}
+
+// ---------- VS Code и его сборки ----------
+
+const VSCODES = [
+  { id: 'vscode', name: 'VS Code', bin: 'code', mac: 'Visual Studio Code.app/Contents/Resources/app/bin/code', win: 'Programs/Microsoft VS Code/bin/code.cmd' },
+  { id: 'cursor', name: 'Cursor', bin: 'cursor', mac: 'Cursor.app/Contents/Resources/app/bin/cursor', win: 'Programs/cursor/resources/app/bin/cursor.cmd' },
+  { id: 'windsurf', name: 'Windsurf', bin: 'windsurf', mac: 'Windsurf.app/Contents/Resources/app/bin/windsurf', win: 'Programs/Windsurf/bin/windsurf.cmd' },
+  { id: 'vscodium', name: 'VSCodium', bin: 'codium', mac: 'VSCodium.app/Contents/Resources/app/bin/codium', win: 'Programs/VSCodium/bin/codium.cmd' },
+];
+
+function which(bin, env = process.env, platform = process.platform) {
+  const exts = platform === 'win32' ? ['.cmd', '.exe', ''] : [''];
+  for (const dir of String(env.PATH || '').split(path.delimiter)) {
+    if (!dir) continue;
+    for (const ext of exts) {
+      const f = path.join(dir, bin + ext);
+      try {
+        if (fs.statSync(f).isFile()) return f;
+      } catch (_) {}
+    }
+  }
+  return null;
+}
+
+function runCli(cli, args, platform = process.platform) {
+  return execFileSync(cli, args, {
+    encoding: 'utf8',
+    timeout: 120000,
+    stdio: ['ignore', 'pipe', 'pipe'],
+    windowsHide: true,
+    shell: platform === 'win32' && /\.cmd$/i.test(cli),
+  });
+}
+
+function vscodeInstalledVersion(cli, platform) {
+  try {
+    const out = runCli(cli, ['--list-extensions', '--show-versions'], platform);
+    const line = out.split(/\r?\n/).find((l) => l.toLowerCase().startsWith(VSIX_ID + '@'));
+    return line ? line.split('@')[1].trim() : null;
+  } catch (_) {
+    return null;
+  }
+}
+
+/** VS Code и его сборки, у которых есть командная строка. */
+function detectVscodes(opts = {}) {
+  const home = opts.home || os.homedir();
+  const platform = opts.platform || process.platform;
+  const env = opts.env || process.env;
+  const seen = new Set();
+  const out = [];
+  for (const v of VSCODES) {
+    let cli = which(v.bin, env, platform);
+    if (!cli && platform === 'darwin') {
+      for (const apps of ['/Applications', path.join(home, 'Applications')]) {
+        const f = path.join(apps, v.mac);
+        if (fs.existsSync(f)) {
+          cli = f;
+          break;
+        }
+      }
+    }
+    if (!cli && platform === 'win32') {
+      const f = path.join(env.LOCALAPPDATA || path.join(home, 'AppData', 'Local'), v.win);
+      if (fs.existsSync(f)) cli = f;
+    }
+    if (!cli) continue;
+    let real = cli;
+    try {
+      real = fs.realpathSync(cli);
+    } catch (_) {}
+    if (seen.has(real)) continue;
+    seen.add(real);
+    out.push({ kind: 'vscode', id: v.id, name: v.name, cli, installed: vscodeInstalledVersion(cli, platform) });
+  }
+  return out;
+}
+
+function installVscode(target, vsixFile, platform = process.platform) {
+  runCli(target.cli, ['--install-extension', vsixFile, '--force'], platform);
+}
+
+// ---------- всё вместе ----------
+
+function detectAll(opts = {}) {
+  return [...detectVscodes(opts), ...detectJetbrains(opts)];
+}
+
+async function download(url, timeoutMs = 60000) {
+  const res = await fetch(url, { signal: AbortSignal.timeout(timeoutMs), headers: { 'user-agent': 'tokenwait/' + require('../package.json').version } });
+  if (!res.ok) throw new Error(`HTTP ${res.status} for ${url}`);
+  return Buffer.from(await res.arrayBuffer());
+}
+
+/** Версии дополнений на сервере: {core, jetbrains, vscode, jetbrains_since_build}. */
+async function latest(server) {
+  const buf = await download(server + '/downloads/versions.json', 10000);
+  const v = JSON.parse(buf.toString('utf8'));
+  return {
+    core: String(v.core || ''),
+    jetbrains: String(v.jetbrains || ''),
+    vscode: String(v.vscode || ''),
+    jetbrains_since_build: Number(v.jetbrains_since_build) || 0,
+  };
+}
+
+/** Что делать с этой IDE: 'install' | 'update' | 'current' | 'too-old'. */
+function plan(target, versions) {
+  if (target.kind === 'jetbrains' && versions.jetbrains_since_build && target.build < versions.jetbrains_since_build) return 'too-old';
+  const want = target.kind === 'jetbrains' ? versions.jetbrains : versions.vscode;
+  if (!target.installed) return 'install';
+  return cmpVersion(target.installed, want) < 0 ? 'update' : 'current';
+}
+
+/**
+ * Поставить или обновить дополнение в выбранных IDE. Архивы скачиваются один раз.
+ * Возвращает [{target, action, ok, error?}].
+ */
+async function apply(server, targets, versions, opts = {}) {
+  const results = [];
+  let vsix = null;
+  let jbZip = null;
+  for (const t of targets) {
+    const action = plan(t, versions);
+    if (action === 'current' || action === 'too-old' || (opts.onlyInstalled && action === 'install')) {
+      results.push({ target: t, action: action === 'install' ? 'skipped' : action, ok: true });
+      continue;
+    }
+    try {
+      if (t.kind === 'vscode') {
+        if (!vsix) {
+          const buf = await download(`${server}/downloads/tokenwait-vscode.vsix?v=${encodeURIComponent(versions.vscode)}`);
+          vsix = path.join(fs.mkdtempSync(path.join(os.tmpdir(), 'tokenwait-')), `tokenwait-${versions.vscode || 'latest'}.vsix`);
+          fs.writeFileSync(vsix, buf);
+        }
+        installVscode(t, vsix);
+      } else {
+        if (!jbZip) jbZip = await download(`${server}/downloads/tokenwait-jetbrains.zip?v=${encodeURIComponent(versions.jetbrains)}`);
+        installJetbrains(t, jbZip);
+      }
+      results.push({ target: t, action, ok: true });
+    } catch (e) {
+      results.push({ target: t, action, ok: false, error: String(e.message || e).split('\n')[0].slice(0, 200) });
+    }
+  }
+  if (vsix) fs.rmSync(path.dirname(vsix), { recursive: true, force: true });
+  return results;
+}
+
+module.exports = { cmpVersion, unzip, jbLayout, detectJetbrains, installJetbrains, detectVscodes, installVscode, detectAll, latest, plan, apply, VSIX_ID };

package/lib/worker.js

@@ -54,8 +54,11 @@ async function report() {
     if (Date.now() - (pend.last_report || 0) < (ads.report_seconds || 60) * 1000) return null;
     const { counts, rest } = toImpressions(pend.ads, impSec);
     if (!Object.keys(counts).length) return null;
-    const waitMs = pend.wait_ms || 0;
-    writeJson(p('pending.json'), { ads: rest, wait_ms: 0, last_report: Date.now() });
+    // Остаток неполных показов переносим вместе с его временем ожидания: иначе в следующем отчёте
+    // показ, собранный из остатка, сервер отклонит (показов не больше, чем время ожидания).
+    const restMs = Object.values(rest).reduce((x, y) => x + y, 0);
+    const waitMs = Math.max(0, (pend.wait_ms || 0) - restMs);
+    writeJson(p('pending.json'), { ads: rest, wait_ms: Math.min(restMs, pend.wait_ms || 0), last_report: Date.now() });
     return { counts, waitMs };
   });
   if (!taken) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenwait",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Get paid while your AI coding agent thinks. A clearly labelled sponsored line for Claude Code, Codex CLI and Gemini CLI.",
   "bin": {
     "tokenwait": "bin/tokenwait.js"