@exreve/exk 1.0.24 → 1.0.26

package/dist/index.js

@@ -16,7 +16,6 @@ import { startApp, stopApp, restartApp, getAppStatuses, getAppLogs } from './app
 import { spawn, execSync } from 'child_process';
 import readline from 'readline';
 import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
 // ============ Constants ============
 const CONFIG_DIR = path.join(os.homedir(), '.talk-to-code');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
@@ -200,168 +199,24 @@ function getCliVersion() {
         return '0.0.0';
     }
 }
-const CURRENT_FILE = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(CURRENT_FILE);
-let cachedCliHash = null;
-function getCliHash() {
-    if (cachedCliHash)
-        return cachedCliHash;
-    try {
-        const hash = createHash('sha256').update(fsSync.readFileSync(CURRENT_FILE)).digest('hex');
-        cachedCliHash = hash;
-        return hash;
-    }
-    catch {
-        // File may be temporarily missing during update — return safe fallback
-        return 'updating';
-    }
-}
-async function checkForUpdate() {
+// ============ Update Helpers ============
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+let isUpdating = false;
+/** Check if a newer version is available on npm */
+async function checkForNpmUpdate() {
     try {
-        const config = await readConfig();
-        const res = await fetch(`${config.apiUrl}/update/check`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ hash: getCliHash(), platform: os.platform() })
-        });
-        if (!res.ok)
-            return null;
-        return await res.json();
+        const currentVersion = getCliVersion();
+        const latestVersion = execSync('npm view @exreve/exk version', { encoding: 'utf-8', timeout: 10000 }).trim();
+        return {
+            updateAvailable: currentVersion !== latestVersion,
+            currentVersion,
+            latestVersion
+        };
     }
     catch {
         return null;
     }
 }
-let isUpdating = false;
-async function replaceSelf(tarballBuffer) {
-    isUpdating = true;
-    const extractDir = path.join(os.tmpdir(), `ttc-update-${Date.now()}`);
-    const stagingDir = path.join(os.tmpdir(), `ttc-stage-${Date.now()}`);
-    try {
-        await fs.mkdir(extractDir, { recursive: true });
-        const tarPath = path.join(extractDir, 'ttc-cli.tar.gz');
-        await fs.writeFile(tarPath, tarballBuffer);
-        execSync(`tar -xzf "${tarPath}" -C "${extractDir}"`);
-        await fs.unlink(tarPath);
-        // Preserve user config/token files (never overwrite on update)
-        const preserveFiles = ['device-config.json', 'device-id.json', 'config.json'];
-        const preserved = {};
-        for (const f of preserveFiles) {
-            try {
-                preserved[f] = await fs.readFile(path.join(CONFIG_DIR, f));
-            }
-            catch {
-                /* file may not exist */
-            }
-        }
-        // Build the complete new state in a staging directory first.
-        // This ensures we never delete the running app until the replacement is
-        // fully prepared and verified — no window where files are missing.
-        const cliStaging = path.join(stagingDir, 'cli');
-        const sharedStaging = path.join(stagingDir, 'shared');
-        await fs.cp(path.join(extractDir, 'cli'), cliStaging, { recursive: true });
-        await fs.cp(path.join(extractDir, 'shared'), sharedStaging, { recursive: true });
-        await fs.copyFile(path.join(extractDir, 'package.json'), path.join(stagingDir, 'package.json'));
-        // Restore preserved config into staging
-        for (const f of preserveFiles) {
-            if (preserved[f])
-                await fs.writeFile(path.join(stagingDir, f), preserved[f]);
-        }
-        // Sanity check: staging must contain a valid dist/index.js
-        const indexJs = path.join(cliStaging, 'dist', 'index.js');
-        try {
-            const stat = await fs.stat(indexJs);
-            if (stat.size === 0)
-                throw new Error('Empty index.js');
-        }
-        catch (err) {
-            throw new Error(`Staged update is invalid (missing or empty dist/index.js): ${err.message}`);
-        }
-        // Atomic swap: rename staging dirs to final locations.
-        // rename() is atomic on the same filesystem. We move the old dirs out of
-        // the way first, then rename new ones in. If anything fails mid-swap we
-        // can attempt to roll back.
-        const cliDest = path.join(CONFIG_DIR, 'cli');
-        const sharedDest = path.join(CONFIG_DIR, 'shared');
-        const cliOld = cliDest + '.old';
-        const sharedOld = sharedDest + '.old';
-        // Move current dirs to .old (must exist for this to work)
-        await fs.rm(cliOld, { recursive: true, force: true });
-        await fs.rm(sharedOld, { recursive: true, force: true });
-        if (fsSync.existsSync(cliDest)) {
-            await fs.rename(cliDest, cliOld);
-        }
-        if (fsSync.existsSync(sharedDest)) {
-            await fs.rename(sharedDest, sharedOld);
-        }
-        // Move staged dirs into place
-        try {
-            await fs.rename(cliStaging, cliDest);
-            await fs.rename(sharedStaging, sharedDest);
-            await fs.copyFile(path.join(stagingDir, 'package.json'), path.join(CONFIG_DIR, 'package.json'));
-        }
-        catch (swapErr) {
-            // Rollback: restore old dirs
-            console.error(`⚠ Swap failed: ${swapErr.message}, rolling back...`);
-            try {
-                if (fsSync.existsSync(cliOld))
-                    await fs.rename(cliOld, cliDest);
-                if (fsSync.existsSync(sharedOld))
-                    await fs.rename(sharedOld, sharedDest);
-            }
-            catch (rollbackErr) {
-                console.error(`⚠ Rollback also failed: ${rollbackErr.message}`);
-            }
-            throw swapErr;
-        }
-        // Clean up old dirs and temp dirs
-        await fs.rm(cliOld, { recursive: true, force: true }).catch(() => { });
-        await fs.rm(sharedOld, { recursive: true, force: true }).catch(() => { });
-        await fs.rm(extractDir, { recursive: true, force: true });
-        await fs.rm(stagingDir, { recursive: true, force: true }).catch(() => { });
-        // Invalidate cached hash since we just replaced the binary
-        cachedCliHash = null;
-        console.log('✓ CLI updated');
-        const npmPaths = [path.join(os.homedir(), '.nvm/versions/node/v22/bin/npm'), path.join(os.homedir(), '.nvm/versions/node/v20/bin/npm')];
-        const npmBin = npmPaths.find(p => fsSync.existsSync(p)) || 'npm';
-        try {
-            execSync(`"${npmBin}" install --omit=dev`, { cwd: CONFIG_DIR, stdio: 'inherit' });
-            console.log('✓ Dependencies updated');
-        }
-        catch {
-            console.warn('⚠ npm install failed');
-        }
-    }
-    finally {
-        isUpdating = false;
-    }
-}
-async function selfUpdate(force = false) {
-    const info = await checkForUpdate();
-    if (!info || !info.updateAvailable) {
-        console.log('✓ Already up to date');
-        return;
-    }
-    console.log('📦 Update available!');
-    if (!force && process.stdin.isTTY) {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const answer = await new Promise(r => rl.question('Update now? [Y/n] ', a => { rl.close(); r(a.trim()); }));
-        if (answer.toLowerCase().startsWith('n'))
-            return;
-    }
-    if (!info.downloadUrl || !info.hash)
-        return;
-    console.log('Downloading...');
-    const res = await fetch(info.downloadUrl);
-    if (!res.ok)
-        throw new Error('Download failed');
-    const bundle = Buffer.from(await res.arrayBuffer());
-    if (createHash('sha256').update(bundle).digest('hex') !== info.hash) {
-        throw new Error('Hash mismatch');
-    }
-    await replaceSelf(bundle);
-    process.exit(0);
-}
 // ============ Commands ============
 async function registerDevice(name, email) {
     try {
@@ -661,9 +516,9 @@ async function runDaemon(foreground = false, email) {
     const ipAddress = getLocalIpAddress();
     const hostname = getHostname();
     // Silent update check on startup
-    checkForUpdate().then(info => {
+    checkForNpmUpdate().then(info => {
         if (info?.updateAvailable)
-            console.log('📦 Update available: run "ttc update"');
+            console.log(`📦 Update available: ${info.currentVersion} → ${info.latestVersion} (run "exk update")`);
     }).catch(() => { });
     if (foreground)
         console.log('=== TalkToCode CLI (Foreground) ===');
@@ -1794,7 +1649,6 @@ async function runDaemon(foreground = false, email) {
                 callback({
                     success: true,
                     version: getCliVersion(),
-                    hash: getCliHash(),
                     date: new Date().toISOString(),
                     nodeVersion: process.version,
                     platform: os.platform(),
@@ -1830,15 +1684,9 @@ async function runDaemon(foreground = false, email) {
                         if (output)
                             console.log(output);
                     }
-                    // Restart PM2 process "cli" after a short delay
+                    // Exit and let PM2 restart us with the new version
                     setTimeout(() => {
-                        try {
-                            execSync('pm2 restart cli', { stdio: 'inherit' });
-                        }
-                        catch {
-                            // If pm2 restart fails, just exit and let pm2 restart us
-                            process.exit(0);
-                        }
+                        process.exit(0);
                     }, 2000);
                 });
                 updateProcess.on('error', (err) => {
@@ -1847,37 +1695,6 @@ async function runDaemon(foreground = false, email) {
                     }
                 });
             });
-            // ========== update:start handler (legacy compatibility) ==========
-            socket.on('update:start', (_data, callback) => {
-                if (isUpdating) {
-                    callback?.({ success: false, error: 'Update already in progress' });
-                    return;
-                }
-                // Use npm-based self-update
-                if (foreground) {
-                    console.log('[update:start] Starting npm self-update...');
-                }
-                callback?.({ success: true, message: 'Update started via npm' });
-                const npmPaths = [
-                    path.join(os.homedir(), '.nvm/versions/node/v22/bin/npm'),
-                    path.join(os.homedir(), '.nvm/versions/node/v20/bin/npm')
-                ];
-                const npmBin = npmPaths.find(p => fsSync.existsSync(p)) || 'npm';
-                const updateProcess = spawn(npmBin, ['update', '-g', '@exreve/exk'], {
-                    stdio: 'pipe',
-                    detached: true
-                });
-                updateProcess.on('close', () => {
-                    setTimeout(() => {
-                        try {
-                            execSync('pm2 restart cli', { stdio: 'inherit' });
-                        }
-                        catch {
-                            process.exit(0);
-                        }
-                    }, 2000);
-                });
-            });
             // Cloudflared handlers
             socket.on('cloudflared:check:request', async () => {
                 try {
@@ -2388,7 +2205,7 @@ async function runDaemon(foreground = false, email) {
                     const { name, image, ports = [], env = {}, runAsRoot = false } = data;
                     // Get CLI directory path (where this script is running from)
                     // Use the same pattern as elsewhere in the file
-                    const cliDir = path.dirname(CURRENT_FILE);
+                    const cliDir = __dirname;
                     // Build docker run command
                     let cmd = `${runtime} run -d --name ${name}`;
                     // Security: Running as root INSIDE container is safe - it's still isolated from host

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exreve/exk",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "exk - Control Claude CLI with voice and programmable interfaces",
   "type": "module",
   "bin": {
@@ -14,7 +14,7 @@
     "container-entrypoint.sh"
   ],
   "scripts": {
-    "build": "tsc && node build-cli-tarball.js",
+    "build": "tsc",
     "build:tsc": "tsc",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "node -e \"require('fs').chmodSync('bin/exk', 0o755)\""