cursorconnect 0.1.5 → 0.1.7

package/dist/index.js

@@ -1,15 +1,20 @@
 #!/usr/bin/env node
 import { join, resolve } from 'path';
 import { ensurePairingIdentity, loadPairingIdentity, refreshPairingCode, } from './pairing-identity.js';
-import { ensureCursorCdp, isBridgeRunning, startBridge, stopBridge, waitBridgeHealth, waitRelayConnector, } from './launch.js';
+import { ensureCursorCdp, isBridgeRunning, startBridge, stopBridge, } from './launch.js';
 import { printPairingToTerminal } from './print-pairing.js';
 import { BRIDGE_LOG_FILE } from './paths.js';
 import { ensureUserConfig, isValidBridgeDir, resolveBridgeDir, USER_CONFIG_ENV, } from './bridge-dir.js';
 import { configFilePath, saveInstallConfig } from './repo-root.js';
 import { formatDiagnoseReport, runDiagnose } from './diagnose.js';
-import { loadEnvFile, resolveRelayConfig } from './relay-config.js';
+import { awaitStartupReadiness, formatStartupChecklist, printStartupFailure, snapshotStartupReadiness, } from './startup-check.js';
+import { DEFAULT_RELAY_URL, loadEnvFile, resolveRelayConfig } from './relay-config.js';
 import { ensureCliVersionForRelay } from './version-check.js';
+import { assertBundledBridgeSupportsRelay, bundledBridgeHasClientVersion, } from './bundled-bridge-check.js';
 import { CLI_VERSION } from './cli-version.js';
+import { askYesNo } from './ask.js';
+import { installCursorCdpLauncher, installMacAutostart, isAutostartInstalled, uninstallMacAutostart, } from './macos-autostart.js';
+import { runServiceLoop } from './run-service.js';
 function bridgeEnv(identity) {
     ensureUserConfig();
     const bridgeDotEnv = join(resolveBridgeDir(), '.env');
@@ -41,6 +46,7 @@ function startFlags(argv) {
     };
 }
 async function cmdStart(argv) {
+    assertBundledBridgeSupportsRelay();
     const { restartCursor, noRestartCursor } = startFlags(argv);
     const identity = ensurePairingIdentity();
     const refreshed = refreshPairingCode(identity);
@@ -61,15 +67,57 @@ async function cmdStart(argv) {
         stopBridge();
     }
     startBridge(env);
-    let health = await waitBridgeHealth(12_000, { requireCdp: false });
-    if (health.ok && cdpPortOk && !health.cdp) {
-        health = await waitBridgeHealth(15_000, { requireCdp: true });
+    const readiness = await awaitStartupReadiness(relayUrl, refreshed, {
+        waitMs: 45_000,
+        requireCdp: cdpPortOk,
+    });
+    if (!readiness.ready) {
+        printStartupFailure(readiness, BRIDGE_LOG_FILE);
+        process.exit(1);
     }
-    await waitRelayConnector(relayUrl, 12_000);
-    if (cdpPortOk && health.ok && !health.cdp) {
-        console.error(`[cursorconnect] CDP не подключён (cdp:false) · лог: ${BRIDGE_LOG_FILE}`);
+    if (cdpPortOk && !readiness.localCdp) {
+        console.warn(`[cursorconnect] CDP не подключён (cdp:false) · лог: ${BRIDGE_LOG_FILE}`);
     }
+    console.log('');
+    console.log('  Проверки перед pairing:');
+    for (const line of formatStartupChecklist(readiness)) {
+        console.log(`  ${line}`);
+    }
+    console.log('');
     printPairingToTerminal(refreshed);
+    if (process.stdin.isTTY && !isAutostartInstalled()) {
+        const yes = await askYesNo('Включить автозапуск Cursor Connect при входе в macOS? (y/n): ');
+        if (yes) {
+            installMacAutostart();
+            const cdp = installCursorCdpLauncher();
+            console.log('');
+            console.log('  Автозапуск включён (launchd).');
+            console.log('  Cursor с CDP: откройте из Dock скрипт');
+            console.log(`  ${cdp}`);
+            console.log('  (перетащите в Dock или «Программы при входе» в настройках macOS).');
+            console.log('  Код pairing: cursorconnect status');
+        }
+    }
+}
+async function cmdRunService() {
+    assertBundledBridgeSupportsRelay();
+    const identity = ensurePairingIdentity();
+    refreshPairingCode(identity);
+    const env = bridgeEnv(identity);
+    await ensureCliVersionForRelay(env.RELAY_URL);
+    console.log('[cursorconnect] run-service (фон, для launchd)…');
+    await runServiceLoop(env);
+}
+async function cmdInstallAutostart() {
+    installMacAutostart();
+    const cdp = installCursorCdpLauncher();
+    console.log('Автозапуск Cursor Connect включён.');
+    console.log(`Cursor с CDP (9222): ${cdp}`);
+    console.log('Код на телефон: cursorconnect status');
+}
+async function cmdUninstallAutostart() {
+    uninstallMacAutostart();
+    console.log('Автозапуск Cursor Connect отключён.');
 }
 async function cmdStop() {
     stopBridge();
@@ -102,7 +150,24 @@ async function cmdStatus() {
         console.error('Identity не найден — запустите: cursorconnect start');
         process.exit(1);
     }
-    console.error(`[cursorconnect] Cursor Connect работает: ${isBridgeRunning()}`);
+    console.log(`CLI: ${CLI_VERSION}`);
+    console.log(bundledBridgeHasClientVersion()
+        ? 'Bridge bundle: OK (clientVersion в relay-upstream)'
+        : 'Bridge bundle: STALE — обновите npm install -g cursorconnect@latest');
+    console.log(`Bridge process: ${isBridgeRunning() ? 'running' : 'stopped'}`);
+    const { relayUrl: relayUrlRaw } = resolveRelayConfig([USER_CONFIG_ENV]);
+    const relayUrl = (relayUrlRaw || DEFAULT_RELAY_URL).replace(/\/$/, '');
+    const readiness = await snapshotStartupReadiness(relayUrl, identity);
+    console.log('');
+    console.log('  Состояние:');
+    for (const line of formatStartupChecklist(readiness)) {
+        console.log(`  ${line}`);
+    }
+    if (!readiness.ready) {
+        console.log('');
+        console.warn('  Код в терминале может не принять приложение — выполните: cursorconnect start');
+    }
+    console.log('');
     printPairingToTerminal(identity);
 }
 async function main() {
@@ -125,6 +190,15 @@ async function main() {
         case 'init':
             await cmdInit(rest[0]);
             break;
+        case 'run-service':
+            await cmdRunService();
+            break;
+        case 'install-autostart':
+            await cmdInstallAutostart();
+            break;
+        case 'uninstall-autostart':
+            await cmdUninstallAutostart();
+            break;
         default:
             console.log(`Usage: cursorconnect <command>
 
@@ -133,12 +207,15 @@ async function main() {
   start --no-restart-cursor — не трогать Cursor (спросит y/n в TTY)
   stop                         — остановить Cursor Connect
   status                       — код и статус
+  install-autostart            — Mac: Cursor Connect при входе (launchd)
+  uninstall-autostart          — отключить автозапуск
   diagnose                     — проверка relay / Cursor Connect / socket (без гаданий)
   init [path]                  — только для разработки (клон репо)
 
 Установка (из любой папки):
   npm install -g cursorconnect
-  cursorconnect start   # код pairing, relay уже в пакете`);
+  cursorconnect start          # первый раз: код + опционально автозапуск
+  cursorconnect install-autostart   # без консоли каждый день`);
             process.exit(cmd === 'help' ? 0 : 1);
     }
 }

package/dist/launch.js

@@ -121,6 +121,53 @@ export async function waitRelayConnector(relayUrl, maxMs = 45_000) {
     }
     return false;
 }
+/** Mac в relay-комнате, код на сервере, токен зарегистрирован (иначе app получит 404). */
+export async function waitRelayPairingReady(relayUrl, roomId, maxMs = 45_000, clientToken) {
+    const base = relayUrl.replace(/\/$/, '');
+    const deadline = Date.now() + maxMs;
+    let lastConnector = false;
+    let lastCodes = 0;
+    let lastTokens = 0;
+    let lastTokenRegistered = false;
+    while (Date.now() < deadline) {
+        try {
+            const q = new URLSearchParams({ roomId });
+            if (clientToken)
+                q.set('token', clientToken);
+            const res = await fetch(`${base}/api/diagnostics?${q}`, {
+                signal: AbortSignal.timeout(8_000),
+            });
+            if (res.ok) {
+                const d = (await res.json());
+                lastConnector = Boolean(d.connectorInRoom);
+                lastCodes = d.pairingCodesActive ?? 0;
+                lastTokens = d.tokensRegistered ?? 0;
+                lastTokenRegistered = d.tokenRegistered === true;
+                const tokenOk = clientToken ? lastTokenRegistered : lastTokens > 0;
+                if (lastConnector && lastCodes > 0 && tokenOk) {
+                    return {
+                        ok: true,
+                        connectorInRoom: true,
+                        pairingCodesActive: lastCodes,
+                        tokensRegistered: lastTokens,
+                        tokenRegistered: lastTokenRegistered,
+                    };
+                }
+            }
+        }
+        catch {
+            /* retry */
+        }
+        await sleep(800);
+    }
+    return {
+        ok: false,
+        connectorInRoom: lastConnector,
+        pairingCodesActive: lastCodes,
+        tokensRegistered: lastTokens,
+        tokenRegistered: lastTokenRegistered,
+    };
+}
 export function isCursorRunning() {
     try {
         execSync('pgrep -x Cursor', { stdio: 'ignore' });

package/dist/macos-autostart.js

@@ -0,0 +1,87 @@
+import { execSync } from 'child_process';
+import { existsSync, mkdirSync, unlinkSync, writeFileSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+import { CURSORCONNECT_DIR } from './paths.js';
+const LABEL = 'com.cursorconnect.service';
+const LAUNCH_AGENT = join(homedir(), 'Library', 'LaunchAgents', `${LABEL}.plist`);
+const CURSOR_CDP_SCRIPT = join(CURSORCONNECT_DIR, 'bin', 'open-cursor-cdp.sh');
+export function resolveCursorconnectBin() {
+    try {
+        return execSync('command -v cursorconnect', { encoding: 'utf-8' }).trim();
+    }
+    catch {
+        return 'cursorconnect';
+    }
+}
+function launchctlLoad() {
+    execSync(`launchctl bootout gui/$(id -u) "${LAUNCH_AGENT}" 2>/dev/null || true`, {
+        stdio: 'ignore',
+        shell: '/bin/bash',
+    });
+    execSync(`launchctl bootstrap gui/$(id -u) "${LAUNCH_AGENT}"`, {
+        stdio: 'inherit',
+        shell: '/bin/bash',
+    });
+}
+export function isAutostartInstalled() {
+    return existsSync(LAUNCH_AGENT);
+}
+export function installMacAutostart() {
+    mkdirSync(CURSORCONNECT_DIR, { recursive: true, mode: 0o700 });
+    const bin = resolveCursorconnectBin();
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${bin}</string>
+    <string>run-service</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${join(CURSORCONNECT_DIR, 'launchd.out.log')}</string>
+  <key>StandardErrorPath</key>
+  <string>${join(CURSORCONNECT_DIR, 'launchd.err.log')}</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+  </dict>
+</dict>
+</plist>
+`;
+    mkdirSync(join(homedir(), 'Library', 'LaunchAgents'), { recursive: true });
+    writeFileSync(LAUNCH_AGENT, plist, { mode: 0o644 });
+    launchctlLoad();
+}
+export function uninstallMacAutostart() {
+    if (existsSync(LAUNCH_AGENT)) {
+        try {
+            execSync(`launchctl bootout gui/$(id -u) "${LAUNCH_AGENT}" 2>/dev/null || true`, {
+                stdio: 'ignore',
+                shell: '/bin/bash',
+            });
+        }
+        catch {
+            /* ignore */
+        }
+        unlinkSync(LAUNCH_AGENT);
+    }
+}
+/** Скрипт: Cursor с CDP (порт 9222) — положите в Dock вместо обычного Cursor. */
+export function installCursorCdpLauncher() {
+    mkdirSync(join(CURSORCONNECT_DIR, 'bin'), { recursive: true, mode: 0o700 });
+    const script = `#!/bin/bash
+# Запуск Cursor с --remote-debugging-port=9222 (нужен для Cursor Connect)
+open -a Cursor --args --remote-debugging-port=9222
+`;
+    writeFileSync(CURSOR_CDP_SCRIPT, script, { mode: 0o755 });
+    return CURSOR_CDP_SCRIPT;
+}

package/dist/pairing-code.js

@@ -1,12 +1,17 @@
 import { randomBytes } from 'crypto';
 export const PAIRING_CODE_LENGTH = 6;
-/** Latin letters + digits (ASCII), uppercase in storage. */
-const ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+/**
+ * Без визуально похожих пар: 0/O/D/Q, 1/I/L, 8/B, 2/Z, 5/S, 6/G.
+ * Синхронизировать с bridge/src/pairing-code.ts и relay/src/pairing-code.ts.
+ */
+export const PAIRING_CODE_ALPHABET = 'ACDEFHJKMNPRTUVWXY3479';
+const ALPHABET_SET = new Set(PAIRING_CODE_ALPHABET.split(''));
 export function generatePairingCode() {
     const bytes = randomBytes(PAIRING_CODE_LENGTH);
+    const n = PAIRING_CODE_ALPHABET.length;
     let out = '';
     for (let i = 0; i < PAIRING_CODE_LENGTH; i++) {
-        out += ALPHABET[bytes[i] % ALPHABET.length];
+        out += PAIRING_CODE_ALPHABET[bytes[i] % n];
     }
     return out;
 }
@@ -14,5 +19,9 @@ export function normalizePairingCode(raw) {
     const code = raw.replace(/[^a-zA-Z0-9]/g, '').toUpperCase();
     if (code.length !== PAIRING_CODE_LENGTH)
         return null;
+    for (const ch of code) {
+        if (!ALPHABET_SET.has(ch))
+            return null;
+    }
     return code;
 }

package/dist/print-pairing.js

@@ -14,6 +14,8 @@ export function printPairingToTerminal(identity) {
     console.log('');
     console.log('  Введите код в приложении Cursor Connect:');
     console.log('');
+    console.log(`  ${code}`);
+    console.log('');
     console.log(renderBigCode(code));
     console.log('');
     console.log('  Код одноразовый');

package/dist/run-service.js

@@ -0,0 +1,31 @@
+import { ensurePairingIdentity, refreshPairingCode, } from './pairing-identity.js';
+import { isBridgeRunning, startBridge, } from './launch.js';
+import { BRIDGE_LOG_FILE } from './paths.js';
+const WATCH_MS = 8_000;
+function sleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+/** Держит Cursor Connect в фоне (для launchd KeepAlive). */
+export async function runServiceLoop(bridgeEnv) {
+    const identity = ensurePairingIdentity();
+    refreshPairingCode(identity);
+    const boot = () => {
+        if (isBridgeRunning())
+            return;
+        try {
+            startBridge(bridgeEnv);
+            console.log(`[cursorconnect] service: bridge started → ${BRIDGE_LOG_FILE}`);
+        }
+        catch (e) {
+            console.error('[cursorconnect] service: start failed', e);
+        }
+    };
+    boot();
+    for (;;) {
+        await sleep(WATCH_MS);
+        if (!isBridgeRunning()) {
+            console.error('[cursorconnect] service: bridge exited, restarting…');
+            boot();
+        }
+    }
+}

package/dist/startup-check.js

@@ -0,0 +1,165 @@
+import { existsSync, readFileSync } from 'fs';
+import { BRIDGE_LOG_FILE } from './paths.js';
+import { waitBridgeHealth, waitRelayPairingReady } from './launch.js';
+export async function fetchRelayRoomDiagnostics(relayUrl, roomId, token) {
+    const base = relayUrl.replace(/\/$/, '');
+    const q = new URLSearchParams({ roomId });
+    if (token)
+        q.set('token', token);
+    try {
+        const res = await fetch(`${base}/api/diagnostics?${q}`, {
+            signal: AbortSignal.timeout(12_000),
+        });
+        if (!res.ok)
+            return null;
+        const d = (await res.json());
+        return {
+            ok: Boolean(d.ok),
+            connectorInRoom: Boolean(d.connectorInRoom),
+            clientsInRoom: Number(d.clientsInRoom ?? 0),
+            pairingCodesActive: Number(d.pairingCodesActive ?? 0),
+            tokensRegistered: Number(d.tokensRegistered ?? 0),
+            tokenRegistered: typeof d.tokenRegistered === 'boolean' ? d.tokenRegistered : null,
+            tokenAccepted: typeof d.tokenAccepted === 'boolean' ? d.tokenAccepted : null,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function normalizePairingCode(code) {
+    return code.replace(/[^A-Z0-9]/g, '').toUpperCase().slice(0, 6);
+}
+export function buildStartupReadiness(identity, local, relay, relayReachable) {
+    const code = normalizePairingCode(identity.pairingCode);
+    const codeExpiresSec = Math.max(0, Math.floor((identity.pairingCodeExpiresAt - Date.now()) / 1000));
+    const codeValid = code.length === 6 && codeExpiresSec > 0;
+    const connectorInRoom = Boolean(relay?.connectorInRoom);
+    const pairingCodesActive = relay?.pairingCodesActive ?? 0;
+    const tokensRegistered = relay?.tokensRegistered ?? 0;
+    const tokenRegistered = relay?.tokenRegistered === true;
+    const ready = local.ok &&
+        codeValid &&
+        relayReachable &&
+        connectorInRoom &&
+        pairingCodesActive > 0 &&
+        tokensRegistered > 0 &&
+        tokenRegistered;
+    return {
+        localBridgeOk: local.ok,
+        localCdp: local.cdp,
+        relayReachable,
+        connectorInRoom,
+        pairingCodesActive,
+        tokensRegistered,
+        tokenRegistered,
+        ready,
+        code,
+        codeExpiresSec,
+        machineLabel: identity.machineLabel,
+    };
+}
+/** Ждём bridge + relay (комната, код на сервере, токен зарегистрирован). */
+export async function awaitStartupReadiness(relayUrl, identity, opts) {
+    const waitMs = opts?.waitMs ?? 45_000;
+    const health = await waitBridgeHealth(Math.min(waitMs, 25_000), {
+        requireCdp: opts?.requireCdp === true,
+    });
+    let relayReachable = false;
+    try {
+        const res = await fetch(`${relayUrl.replace(/\/$/, '')}/health`, {
+            signal: AbortSignal.timeout(8_000),
+        });
+        relayReachable = res.ok;
+    }
+    catch {
+        relayReachable = false;
+    }
+    await waitRelayPairingReady(relayUrl, identity.roomId, waitMs, identity.clientToken);
+    const relay = await fetchRelayRoomDiagnostics(relayUrl, identity.roomId, identity.clientToken);
+    return buildStartupReadiness(identity, { ok: health.ok, cdp: health.cdp }, relay, relayReachable);
+}
+/** Однократная проверка (для status). */
+export async function snapshotStartupReadiness(relayUrl, identity) {
+    let local = { ok: false, cdp: false };
+    try {
+        const res = await fetch('http://127.0.0.1:3847/health', {
+            signal: AbortSignal.timeout(3_000),
+        });
+        if (res.ok) {
+            const j = (await res.json());
+            local = { ok: Boolean(j.ok), cdp: Boolean(j.cdp) };
+        }
+    }
+    catch {
+        /* ignore */
+    }
+    let relayReachable = false;
+    try {
+        const res = await fetch(`${relayUrl.replace(/\/$/, '')}/health`, {
+            signal: AbortSignal.timeout(8_000),
+        });
+        relayReachable = res.ok;
+    }
+    catch {
+        relayReachable = false;
+    }
+    const relay = await fetchRelayRoomDiagnostics(relayUrl, identity.roomId, identity.clientToken);
+    return buildStartupReadiness(identity, local, relay, relayReachable);
+}
+export function formatStartupChecklist(r) {
+    const mark = (ok) => (ok ? '✓' : '✗');
+    const lines = [
+        `${mark(r.localBridgeOk)} Cursor Connect на Mac (localhost:3847)`,
+        r.localBridgeOk
+            ? `    cdp: ${r.localCdp ? 'подключён — live-чаты из Cursor' : 'нет — только архив JSONL'}`
+            : '    запустите cursorconnect start',
+        `${mark(r.relayReachable)} Relay ${r.relayReachable ? 'доступен' : 'недоступен'}`,
+        `${mark(r.connectorInRoom)} Mac в вашей комнате на relay`,
+        `${mark(r.pairingCodesActive > 0)} Код на сервере (можно вводить в приложении)`,
+        r.pairingCodesActive > 0
+            ? `    активных кодов: ${r.pairingCodesActive}`
+            : '    код не зарегистрирован — повторите start (не вводите старый код из терминала)',
+        `${mark(r.tokenRegistered)} Токен телефона зарегистрирован bridge'ем`,
+    ];
+    if (r.ready) {
+        lines.push('', `  Готово к pairing: код ${r.code} · ~${Math.ceil(r.codeExpiresSec / 60)} мин · одноразовый`);
+    }
+    return lines;
+}
+export function printStartupFailure(r, logPath = BRIDGE_LOG_FILE) {
+    console.error('');
+    console.error('[cursorconnect] Запуск не готов — приложение код не примет.');
+    console.error('');
+    for (const line of formatStartupChecklist(r)) {
+        console.error(`  ${line}`);
+    }
+    console.error('');
+    if (!r.connectorInRoom) {
+        console.error('  Mac не в комнате: npm install -g cursorconnect@latest && cursorconnect stop && cursorconnect start');
+    }
+    else if (r.pairingCodesActive === 0) {
+        console.error('  Код не на relay (уже введён или bridge не успел): cursorconnect stop && cursorconnect start');
+        console.error('  Не вводите код из прошлого запуска — только свежий после start.');
+    }
+    else if (!r.tokenRegistered) {
+        console.error('  Токен не зарегистрирован — перезапустите bridge (cursorconnect start).');
+    }
+    if (!r.localBridgeOk) {
+        console.error(`  Лог: ${logPath}`);
+        tailLogLines(logPath, 12).forEach((l) => console.error(`    ${l}`));
+    }
+    console.error('');
+}
+function tailLogLines(path, n) {
+    if (!existsSync(path))
+        return ['(лог пуст)'];
+    try {
+        const raw = readFileSync(path, 'utf-8');
+        const lines = raw.trim().split('\n').filter(Boolean);
+        return lines.slice(-n);
+    }
+    catch {
+        return ['(не удалось прочитать лог)'];
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursorconnect",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "CLI: Cursor Connect on Mac + relay pairing — install once, run from anywhere",
   "license": "MIT",
   "type": "module",

package/version-policy.json

@@ -1,7 +1,7 @@
 {
   "minCliVersion": "0.1.4",
   "minAppVersion": "0.2.2",
-  "latestCliVersion": "0.1.4",
+  "latestCliVersion": "0.1.7",
   "latestAppVersion": "0.2.2",
   "updateCliCommand": "npm install -g cursorconnect@latest",
   "updateAppHint": "Обновите CursorConnect в App Store / TestFlight до последней сборки."