codebuff-cli 1.0.14 → 1.0.15

package/NOTICE

@@ -0,0 +1,4 @@
+Codebuff
+Copyright 2025 Codebuff
+
+This product includes software developed for the Codebuff project. 

package/cli/scripts/download-binary.cjs

@@ -3,57 +3,33 @@ const fs = require('fs');
 const path = require('path');
 const https = require('https');
 const http = require('http');
+const os = require('os');
 
 const REPO = 'Marcus-Mok-GH/codebuff-cli';
 const BINARY_NAME = 'codebuff';
-const MAX_RETRIES = 3;
-const REQUEST_TIMEOUT_MS = 120000;
-const MAX_REDIRECTS = 10;
 
 function getVersion() {
-  const pkgPath = path.join(__dirname, '..', 'package.json');
-  try {
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-    if (pkg.version) return pkg.version;
-  } catch {}
-  throw new Error('Could not determine version from ' + pkgPath);
-}
-
-function getPlatform() {
-  const platform = process.platform;
-  const arch = process.arch;
-  const mappings = {
-    darwin: 'darwin',
-    linux: 'linux',
-    win32: 'win32',
-  };
-  const osName = mappings[platform] || platform;
-  return osName + '-' + arch;
+  const candidates = [
+    path.join(__dirname, '..', '..', 'package.json'),
+    path.join(__dirname, '..', 'package.json'),
+  ];
+  for (const p of candidates) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(p, 'utf8'));
+      if (pkg.version) return pkg.version;
+    } catch {}
+  }
+  return '1.0.9';
 }
 
 function getBinaryPath() {
-  const binDir = path.join(__dirname, '..', 'bin');
-  const name = process.platform === 'win32' ? BINARY_NAME + '.exe' : BINARY_NAME;
+  const binDir = path.join(os.homedir(), '.codebuff');
+  const name = process.platform === 'win32' ? `${BINARY_NAME}.exe` : BINARY_NAME;
   return path.join(binDir, name);
 }
 
-function cleanup(dest) {
-  try {
-    if (fs.existsSync(dest)) {
-      fs.unlinkSync(dest);
-    }
-  } catch {
-    // ignore cleanup errors
-  }
-}
-
-function download(url, dest, redirectCount = 0) {
+function download(url, dest) {
   return new Promise((resolve, reject) => {
-    if (redirectCount > MAX_REDIRECTS) {
-      reject(new Error('Too many redirects (max ' + MAX_REDIRECTS + ') while downloading from ' + url));
-      return;
-    }
-
     const client = url.startsWith('https:') ? https : http;
     const file = fs.createWriteStream(dest);
 
@@ -61,10 +37,10 @@ function download(url, dest, redirectCount = 0) {
       url,
       { headers: { 'User-Agent': 'codebuff-cli-installer' } },
       (res) => {
-        if (res.statusCode === 301 || res.statusCode === 302 || res.statusCode === 307 || res.statusCode === 308) {
+        if (res.statusCode === 301 || res.statusCode === 302) {
           file.close();
-          cleanup(dest);
-          download(new URL(res.headers.location, url).href, dest, redirectCount + 1)
+          if (fs.existsSync(dest)) fs.unlinkSync(dest);
+          download(new URL(res.headers.location, url).href, dest)
             .then(resolve)
             .catch(reject);
           return;
@@ -72,8 +48,8 @@ function download(url, dest, redirectCount = 0) {
 
         if (res.statusCode !== 200) {
           file.close();
-          cleanup(dest);
-          reject(new Error('Download failed: HTTP ' + res.statusCode + ' from ' + url));
+          if (fs.existsSync(dest)) fs.unlinkSync(dest);
+          reject(new Error(`HTTP ${res.statusCode}`));
           return;
         }
 
@@ -87,78 +63,67 @@ function download(url, dest, redirectCount = 0) {
 
     req.on('error', (err) => {
       file.close();
-      cleanup(dest);
-      reject(new Error('Network error downloading from ' + url + ': ' + err.message));
+      if (fs.existsSync(dest)) fs.unlinkSync(dest);
+      reject(err);
     });
 
-    req.setTimeout(REQUEST_TIMEOUT_MS, () => {
+    req.setTimeout(30000, () => {
       req.destroy();
       file.close();
-      cleanup(dest);
-      reject(new Error('Download timeout (' + REQUEST_TIMEOUT_MS + 'ms) for ' + url));
+      if (fs.existsSync(dest)) fs.unlinkSync(dest);
+      reject(new Error('Request timeout'));
     });
   });
 }
 
-async function downloadWithRetry(url, dest) {
-  let lastError;
-  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-    try {
-      console.log('Downloading binary (attempt ' + attempt + '/' + MAX_RETRIES + ')...');
-      await download(url, dest);
-      return true;
-    } catch (err) {
-      lastError = err;
-      console.error('Attempt ' + attempt + ' failed: ' + err.message);
-      if (attempt < MAX_RETRIES) {
-        const delay = Math.pow(2, attempt) * 1000;
-        console.log('Retrying in ' + delay + 'ms...');
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    }
+async function tryDownload(url, dest) {
+  try {
+    await download(url, dest);
+    return true;
+  } catch {
+    return false;
   }
-  console.error('Failed to download binary after ' + MAX_RETRIES + ' attempts.');
-  console.error('Last error: ' + lastError.message);
-  return false;
 }
 
 async function main() {
-  const version = getVersion();
-  const platform = getPlatform();
   const binaryPath = getBinaryPath();
 
-  const url = 'https://github.com/' + REPO + '/releases/download/v' + version + '/codebuff-' + platform;
+  if (fs.existsSync(binaryPath)) {
+    console.log('Binary already exists at', binaryPath);
+    return;
+  }
+
+  const version = getVersion();
+  const baseUrl = `https://github.com/${REPO}/releases/download/v${version}`;
 
-  console.log('Platform: ' + platform);
-  console.log('Version: ' + version);
-  console.log('Binary path: ' + binaryPath);
-  console.log('Download URL: ' + url);
+  // Try platform-specific binary first
+  const platformName = `${BINARY_NAME}-${process.platform}-${process.arch}${
+    process.platform === 'win32' ? '.exe' : ''
+  }`;
+  const platformUrl = `${baseUrl}/${platformName}`;
+  const genericUrl = `${baseUrl}/${BINARY_NAME}`;
 
   fs.mkdirSync(path.dirname(binaryPath), { recursive: true });
 
-  if (fs.existsSync(binaryPath)) {
-    console.log('Binary already exists. Skipping download.');
-    process.exit(0);
-  }
-
-  if (await downloadWithRetry(url, binaryPath)) {
-    console.log('Download complete.');
+  if (await tryDownload(platformUrl, binaryPath)) {
+    console.log(`Downloaded platform-specific binary: ${platformName}`);
+  } else if (await tryDownload(genericUrl, binaryPath)) {
+    console.log(`Downloaded generic binary: ${BINARY_NAME}`);
   } else {
-    console.error('\nUnable to download the codebuff binary.');
-    console.error('You can try installing manually from:');
-    console.error('  ' + url);
+    console.error(
+      `Failed to download binary from:\n  ${platformUrl}\n  ${genericUrl}`
+    );
     process.exit(1);
   }
 
   if (process.platform !== 'win32') {
     fs.chmodSync(binaryPath, 0o755);
-    console.log('Made binary executable.');
   }
 
-  console.log('Binary installed at: ' + binaryPath);
+  console.log(`Binary installed at: ${binaryPath}`);
 }
 
 main().catch((err) => {
-  console.error('Fatal error:', err.message);
+  console.error('Error:', err.message);
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuff-cli",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "license": "Apache-2.0",
   "bin": {
     "codebuff": "cli/bin/codebuff.cjs",
@@ -10,7 +10,8 @@
     "cli/bin/codebuff.cjs",
     "cli/scripts/download-binary.cjs",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "NOTICE"
   ],
   "publishConfig": {
     "access": "public"
@@ -42,7 +43,8 @@
     "test": "bun --filter='{@codebuff/common,@codebuff/agents,@codebuff/agent-runtime,@codebuff/sdk,@codebuff/cli,@codebuff/evals,@codebuff/scripts}' run test",
     "init-worktree": "bun scripts/init-worktree.ts",
     "cleanup-worktree": "bun scripts/cleanup-worktree.ts",
-    "generate-tool-definitions": "bun scripts/generate-tool-definitions.ts"
+    "generate-tool-definitions": "bun scripts/generate-tool-definitions.ts",
+    "postinstall": "node cli/scripts/download-binary.cjs"
   },
   "dependencies": {
     "@t3-oss/env-nextjs": "^0.7.3",

package/cli/bin/codebuff.cjs

@@ -1,165 +0,0 @@
-#!/usr/bin/env node
-const { spawn } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const https = require('https');
-const http = require('http');
-
-const BINARY_NAME = 'codebuff';
-const REPO = 'Marcus-Mok-GH/codebuff-cli';
-
-const moduleBinary = path.join(__dirname, process.platform === 'win32' ? `${BINARY_NAME}.exe` : BINARY_NAME);
-const localDir = path.join(os.homedir(), '.codebuff', 'bin');
-const localBinary = path.join(localDir, process.platform === 'win32' ? `${BINARY_NAME}.exe` : BINARY_NAME);
-
-function resolveBinaryPath() {
-  if (fs.existsSync(localBinary)) return localBinary;
-  if (fs.existsSync(moduleBinary)) return moduleBinary;
-  return null;
-}
-
-function getVersion() {
-  const candidates = [
-    path.join(__dirname, '..', '..', 'package.json'),
-    path.join(__dirname, '..', 'package.json'),
-  ];
-  for (const p of candidates) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(p, 'utf8'));
-      if (pkg.version) return pkg.version;
-    } catch {}
-  }
-  return null;
-}
-
-function download(url, dest) {
-  return new Promise((resolve, reject) => {
-    const client = url.startsWith('https:') ? https : http;
-    const file = fs.createWriteStream(dest);
-
-    const req = client.get(
-      url,
-      { headers: { 'User-Agent': 'codebuff-cli-installer' } },
-      (res) => {
-        if (res.statusCode === 301 || res.statusCode === 302) {
-          file.close();
-          if (fs.existsSync(dest)) fs.unlinkSync(dest);
-          download(new URL(res.headers.location, url).href, dest)
-            .then(resolve)
-            .catch(reject);
-          return;
-        }
-
-        if (res.statusCode !== 200) {
-          file.close();
-          if (fs.existsSync(dest)) fs.unlinkSync(dest);
-          reject(new Error(`HTTP ${res.statusCode}`));
-          return;
-        }
-
-        res.pipe(file);
-        file.on('finish', () => {
-          file.close();
-          resolve();
-        });
-      }
-    );
-
-    req.on('error', (err) => {
-      file.close();
-      if (fs.existsSync(dest)) fs.unlinkSync(dest);
-      reject(err);
-    });
-
-    req.setTimeout(30000, () => {
-      req.destroy();
-      file.close();
-      if (fs.existsSync(dest)) fs.unlinkSync(dest);
-      reject(new Error('Request timeout'));
-    });
-  });
-}
-
-async function tryDownload(url, dest) {
-  try {
-    await download(url, dest);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function downloadBinary(destPath) {
-  const version = getVersion();
-  if (!version) {
-    throw new Error('Could not determine version from package.json');
-  }
-
-  const baseUrl = `https://github.com/${REPO}/releases/download/v${version}`;
-  const platformName = `${BINARY_NAME}-${process.platform}-${process.arch}${process.platform === 'win32' ? '.exe' : ''}`;
-  const platformUrl = `${baseUrl}/${platformName}`;
-  const genericUrl = `${baseUrl}/${BINARY_NAME}`;
-
-  fs.mkdirSync(path.dirname(destPath), { recursive: true });
-
-  if (await tryDownload(platformUrl, destPath)) {
-    console.log(`Downloaded platform-specific binary: ${platformName}`);
-  } else if (await tryDownload(genericUrl, destPath)) {
-    console.log(`Downloaded generic binary: ${BINARY_NAME}`);
-  } else {
-    throw new Error(
-      `Failed to download binary from:\n  ${platformUrl}\n  ${genericUrl}`
-    );
-  }
-
-  if (process.platform !== 'win32') {
-    fs.chmodSync(destPath, 0o755);
-  }
-}
-
-function runBinary(binaryPath) {
-  const child = spawn(binaryPath, process.argv.slice(2), {
-    stdio: 'inherit',
-  });
-
-  child.on('exit', (code, signal) => {
-    process.exit(signal ? 1 : code || 0);
-  });
-
-  child.on('error', (err) => {
-    console.error('Failed to start codebuff:', err.message);
-    process.exit(1);
-  });
-}
-
-async function main() {
-  let binaryPath = resolveBinaryPath();
-
-  if (binaryPath) {
-    runBinary(binaryPath);
-    return;
-  }
-
-  console.log('Codebuff binary not found. Downloading...');
-
-  try {
-    await downloadBinary(localBinary);
-    binaryPath = localBinary;
-  } catch (err) {
-    console.error('Failed to download codebuff:', err.message);
-    process.exit(1);
-  }
-
-  if (!fs.existsSync(binaryPath)) {
-    console.error('Binary still not found after download.');
-    process.exit(1);
-  }
-
-  runBinary(binaryPath);
-}
-
-main().catch((err) => {
-  console.error('Error:', err.message);
-  process.exit(1);
-});