cicy-code 0.2.3 → 0.2.5

package/bin/cicy-code.js

@@ -6,8 +6,10 @@ const https = require('https');
 
 const pkg = require('../package.json');
 const binPath = path.join(__dirname, 'cicy-code');
+const os = require('os');
 
 const cn = process.argv.includes('--cn') || process.env.CN_MIRROR === '1';
+const desktopMode = process.argv.includes('--desktop');
 
 if (process.argv.includes('--cn')) {
   process.env.CN_MIRROR = '1';
@@ -86,6 +88,11 @@ async function main() {
     process.exit(1);
   }
 
+  // Desktop mode: start API server in background, then launch Electron
+  if (desktopMode) {
+    return launchDesktop();
+  }
+
   const child = spawn(binPath, process.argv.slice(2), {
     stdio: 'inherit',
     env: process.env
@@ -93,4 +100,120 @@ async function main() {
   child.on('exit', (code) => process.exit(code || 0));
 }
 
+function getToken() {
+  try {
+    const globalJson = path.join(os.homedir(), 'global.json');
+    const data = JSON.parse(fs.readFileSync(globalJson, 'utf8'));
+    return data.api_token || '';
+  } catch { return ''; }
+}
+
+function waitForServer(port, timeout) {
+  const http = require('http');
+  const start = Date.now();
+  return new Promise((resolve, reject) => {
+    const check = () => {
+      if (Date.now() - start > timeout) return reject(new Error('Server start timeout'));
+      const req = http.get(`http://127.0.0.1:${port}/api/health`, (res) => {
+        resolve();
+      });
+      req.on('error', () => setTimeout(check, 500));
+      req.setTimeout(1000, () => { req.destroy(); setTimeout(check, 500); });
+    };
+    check();
+  });
+}
+
+async function launchDesktop() {
+  const port = process.env.PORT || 18008;
+  const desktopPort = 18101;
+
+  // 1. Start API server in background
+  const serverArgs = process.argv.slice(2).filter(a => a !== '--desktop');
+  const server = spawn(binPath, serverArgs, {
+    stdio: 'ignore',
+    detached: true,
+    env: process.env
+  });
+  server.unref();
+  console.log(`  🚀 Starting cicy-code server (PID: ${server.pid})...`);
+
+  // 2. Wait for server ready
+  try {
+    await waitForServer(port, 30000);
+  } catch {
+    console.error('  ❌ Server failed to start within 30s');
+    process.exit(1);
+  }
+  console.log(`  ✅ Server ready on port ${port}`);
+
+  // 3. Get token
+  const token = getToken();
+  const url = `http://127.0.0.1:${port}/?token=${token}`;
+
+  // 4. Launch Electron via global 'electron' binary (no signing needed)
+  //    cicy-desktop uses official Electron binary + our JS code
+  //    RPC/MCP server starts on desktopPort (18101)
+  let electronBinary = null;
+  try {
+    electronBinary = execSync('which electron 2>/dev/null', { encoding: 'utf8' }).trim();
+  } catch {}
+
+  if (!electronBinary) {
+    console.log('  ⚠️  Electron not found. Installing...');
+    try {
+      execSync('npm install -g electron', { stdio: 'inherit' });
+      electronBinary = execSync('which electron', { encoding: 'utf8' }).trim();
+    } catch {
+      console.error('  ❌ Failed to install Electron. Install manually: npm install -g electron');
+      console.log(`  📱 Fallback: open browser → ${url}`);
+      return;
+    }
+  }
+
+  // Find cicy-desktop package (global cicy or bundled desktop/)
+  let desktopDir = null;
+
+  // Check global 'cicy-desktop' package
+  try {
+    const cicyBin = execSync('which cicy 2>/dev/null', { encoding: 'utf8' }).trim();
+    desktopDir = path.resolve(path.dirname(cicyBin), '..', 'lib', 'node_modules', 'cicy-desktop');
+    if (!fs.existsSync(path.join(desktopDir, 'src', 'main.js'))) desktopDir = null;
+  } catch {}
+
+  // Fallback: bundled desktop/ submodule
+  if (!desktopDir) {
+    const bundled = path.join(__dirname, '..', '..', 'desktop');
+    if (fs.existsSync(path.join(bundled, 'src', 'main.js'))) {
+      desktopDir = bundled;
+    }
+  }
+
+  if (!desktopDir) {
+    console.log('  ⚠️  cicy-desktop not found. Installing...');
+    try {
+      execSync('npm install -g cicy-desktop', { stdio: 'inherit' });
+      const cicyBin = execSync('which cicy', { encoding: 'utf8' }).trim();
+      desktopDir = path.resolve(path.dirname(cicyBin), '..', 'lib', 'node_modules', 'cicy-desktop');
+    } catch {
+      console.error('  ❌ Failed to install cicy. Install manually: npm install -g cicy-desktop');
+      console.log(`  📱 Fallback: open browser → ${url}`);
+      return;
+    }
+  }
+
+  console.log(`  🖥️  Opening desktop: ${url}`);
+  console.log(`  🔧 RPC/MCP server: http://127.0.0.1:${desktopPort}`);
+
+  const desktop = spawn(electronBinary, [desktopDir, `--url=${url}`, `--port=${desktopPort}`], {
+    stdio: 'inherit',
+    env: { ...process.env, PORT: String(desktopPort) }
+  });
+
+  desktop.on('exit', (code) => {
+    try { process.kill(server.pid); } catch {}
+    process.exit(code || 0);
+  });
+}
+
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-code",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "CiCy Code - AI-powered development environment",
   "bin": {
     "cicy-code": "bin/cicy-code.js"

package/scripts/install.js

@@ -20,7 +20,11 @@ const key = `${process.platform}-${process.arch}`;
 const binName = PLATFORMS[key];
 
 if (!binName) {
-  console.error(`Unsupported platform: ${key}`);
+  if (process.platform === 'win32') {
+    console.error('Windows is not supported natively. Please use WSL:\n  wsl --install\n  wsl npx cicy-code');
+  } else {
+    console.error(`Unsupported platform: ${key}`);
+  }
   process.exit(1);
 }