cursorconnect 0.1.5 → 0.1.6

package/bridge-runtime/connector-version.json

@@ -0,0 +1 @@
+{"cliVersion":"0.1.6","bundledAt":"2026-05-25T09:55:59Z"}

package/bridge-runtime/dist/connector-client-version.d.ts

@@ -0,0 +1,2 @@
+/** Версия для relay auth (должна быть ≥ MIN_CLI_VERSION на VPS). */
+export declare function connectorClientVersion(): string;

package/bridge-runtime/dist/connector-client-version.js

@@ -0,0 +1,43 @@
+import { existsSync, readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+const MIN_FALLBACK = '0.1.5';
+function readJsonVersion(path) {
+    if (!existsSync(path))
+        return null;
+    try {
+        const raw = JSON.parse(readFileSync(path, 'utf-8'));
+        const v = raw.cliVersion?.trim() || raw.version?.trim();
+        return v || null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Версия для relay auth (должна быть ≥ MIN_CLI_VERSION на VPS). */
+export function connectorClientVersion() {
+    const fromEnv = process.env.CURSORCONNECT_CLI_VERSION?.trim();
+    if (fromEnv && fromEnv !== '0.0.0')
+        return fromEnv;
+    const bridgeRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
+    const fromBundle = readJsonVersion(join(bridgeRoot, 'connector-version.json'));
+    if (fromBundle)
+        return fromBundle;
+    const candidates = [
+        join(bridgeRoot, '..', 'connect', 'package.json'),
+        join(bridgeRoot, 'package.json'),
+    ];
+    for (const p of candidates) {
+        if (!existsSync(p))
+            continue;
+        try {
+            const pkg = JSON.parse(readFileSync(p, 'utf-8'));
+            if (pkg.version?.trim())
+                return pkg.version.trim();
+        }
+        catch {
+            /* next */
+        }
+    }
+    return MIN_FALLBACK;
+}

package/bridge-runtime/dist/index.js

@@ -7,10 +7,13 @@ import { JsonlIndex } from './jsonl-index.js';
 import { WindowMonitor } from './window-monitor.js';
 import { Relay } from './relay.js';
 import { MessageDebugStore } from './message-debug-store.js';
+import { connectorClientVersion } from './connector-client-version.js';
 async function main() {
     const config = loadConfig();
     const selectors = loadSelectors();
+    const connectorVersion = connectorClientVersion();
     console.log('=== CursorConnect Bridge ===');
+    console.log(`Connector version: ${connectorVersion} (env=${process.env.CURSORCONNECT_CLI_VERSION?.trim() || '-'})`);
     console.log(`CDP: ${config.cdpUrl}`);
     console.log(`Server: http://${config.serverHost}:${config.serverPort}`);
     if (config.relayUrl) {

package/bridge-runtime/dist/relay-upstream.js

@@ -1,4 +1,5 @@
 import { io } from 'socket.io-client';
+import { connectorClientVersion } from './connector-client-version.js';
 import { loadPairingIdentity } from './pairing-identity.js';
 const CLIENT_EVENTS = [
     'command',
@@ -51,6 +52,8 @@ export class RelayUpstream {
                 role: 'connector',
                 token: this.config.relayToken,
                 roomId: this.config.relayRoomId,
+                clientKind: 'connector',
+                clientVersion: connectorClientVersion(),
             },
         });
         this.socket.on('connect', () => {
@@ -58,7 +61,12 @@ export class RelayUpstream {
             this.registerPairing();
         });
         this.socket.on('connect_error', (err) => {
-            console.warn('[relay-upstream] connect_error:', err.message);
+            const v = connectorClientVersion();
+            console.warn(`[relay-upstream] connect_error: ${err.message} (clientVersion=${v})`);
+            if (String(err.message).includes('CLI_VERSION_OUTDATED') ||
+                String(err.message).includes('CLI_VERSION_MISSING')) {
+                console.warn('[relay-upstream] Обновите cursorconnect: npm install -g cursorconnect@latest && cursorconnect start');
+            }
         });
         this.socket.on('disconnect', (reason) => {
             console.log('[relay-upstream] disconnected:', reason);

package/bridge-runtime/dist/relay.js

@@ -243,7 +243,7 @@ export class Relay {
             const apiKey = this.config.openaiApiKey;
             if (!apiKey) {
                 res.status(503).json({
-                    error: 'OPENAI_API_KEY not set on bridge (add to bridge/.env)',
+                    error: 'OPENAI_API_KEY not set on Cursor Connect Mac (add to bridge/.env)',
                 });
                 return;
             }

package/dist/bundled-bridge-check.js

@@ -0,0 +1,25 @@
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import { resolveBridgeDir } from './bridge-dir.js';
+export function bundledBridgeHasClientVersion() {
+    let bridgeDir;
+    try {
+        bridgeDir = resolveBridgeDir();
+    }
+    catch {
+        return true;
+    }
+    const relayUpstream = join(bridgeDir, 'dist/relay-upstream.js');
+    if (!existsSync(relayUpstream))
+        return true;
+    return readFileSync(relayUpstream, 'utf8').includes('clientVersion');
+}
+/** npm-пакет должен включать bridge с auth.clientVersion (иначе relay отклоняет connector). */
+export function assertBundledBridgeSupportsRelay() {
+    if (bundledBridgeHasClientVersion())
+        return;
+    console.error('[cursorconnect] Устаревший bridge внутри npm-пакета (нет clientVersion для relay).\n' +
+        '  npm install -g cursorconnect@latest\n' +
+        '  Если уже latest — дождитесь публикации fix или запускайте из клона: npm run bundle-bridge -w connect');
+    process.exit(1);
+}

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/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, waitBridgeHealth, waitRelayPairingReady, } 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';
@@ -9,6 +9,7 @@ import { configFilePath, saveInstallConfig } from './repo-root.js';
 import { formatDiagnoseReport, runDiagnose } from './diagnose.js';
 import { 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';
 function bridgeEnv(identity) {
     ensureUserConfig();
@@ -41,6 +42,7 @@ function startFlags(argv) {
     };
 }
 async function cmdStart(argv) {
+    assertBundledBridgeSupportsRelay();
     const { restartCursor, noRestartCursor } = startFlags(argv);
     const identity = ensurePairingIdentity();
     const refreshed = refreshPairingCode(identity);
@@ -65,7 +67,19 @@ async function cmdStart(argv) {
     if (health.ok && cdpPortOk && !health.cdp) {
         health = await waitBridgeHealth(15_000, { requireCdp: true });
     }
-    await waitRelayConnector(relayUrl, 12_000);
+    const pairingReady = await waitRelayPairingReady(relayUrl, refreshed.roomId, 30_000);
+    if (!pairingReady.ok) {
+        console.error('[cursorconnect] Код не зарегистрирован на relay — приложение его не примет.');
+        if (!pairingReady.connectorInRoom) {
+            console.error('  Mac не подключён к серверу. Обновите CLI: npm install -g cursorconnect@latest');
+            console.error('  Затем снова: cursorconnect start');
+            console.error(`  Лог bridge: ${BRIDGE_LOG_FILE}`);
+        }
+        else {
+            console.error('  Connector в комнате, но код не на сервере — подождите и повторите start.');
+        }
+        process.exit(1);
+    }
     if (cdpPortOk && health.ok && !health.cdp) {
         console.error(`[cursorconnect] CDP не подключён (cdp:false) · лог: ${BRIDGE_LOG_FILE}`);
     }
@@ -102,7 +116,11 @@ 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'}`);
     printPairingToTerminal(identity);
 }
 async function main() {

package/dist/launch.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursorconnect",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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.6",
   "latestAppVersion": "0.2.2",
   "updateCliCommand": "npm install -g cursorconnect@latest",
   "updateAppHint": "Обновите CursorConnect в App Store / TestFlight до последней сборки."