knoxis-collab 1.0.0 → 1.1.1

package/knoxis-collab.js

@@ -18,7 +18,9 @@
  *   KNOXIS_TASK_FILE=/tmp/task.txt node knoxis-collab.js
  *
  * Env:
- *   GROQ_API_KEY             - Required (or set in ~/.knoxis/config.json)
+ *   KNOXIS_BACKEND_URL       - Backend URL (or backendUrl in ~/.knoxis/config.json)
+ *   KNOXIS_USER_ID           - User UUID (or userId in ~/.knoxis/config.json)
+ *   GROQ_API_KEY             - Direct Groq key (optional — backend proxy is preferred)
  *   KNOXIS_WORKSPACE         - Workspace directory (default: cwd)
  *   KNOXIS_TASK_FILE         - Path to file containing initial task
  *   KNOXIS_GROQ_MODEL        - Groq model (default: llama-3.3-70b-versatile)
@@ -80,6 +82,53 @@ function loadConfig() {
 
 const config = loadConfig();
 const GROQ_API_KEY = process.env.GROQ_API_KEY || config.groqApiKey || '';
+const BACKEND_URL = process.env.KNOXIS_BACKEND_URL || config.backendUrl || '';
+const USER_ID = process.env.KNOXIS_USER_ID || config.userId || '';
+
+// Resolve Claude binary — check every reasonable location
+function resolveClaudeBin() {
+  // 1. Local node_modules (when installed as npm package)
+  const localBin = path.join(__dirname, 'node_modules', '.bin', 'claude');
+  if (fs.existsSync(localBin)) return localBin;
+
+  // 2. Parent node_modules (when this is a dep of another package)
+  const parentBin = path.join(__dirname, '..', '.bin', 'claude');
+  if (fs.existsSync(parentBin)) return parentBin;
+
+  // 3. Global npm prefix bin (same dir where knoxis-collab bin lands)
+  try {
+    const { status, stdout } = spawnSync('npm', ['prefix', '-g'], { stdio: 'pipe' });
+    if (status === 0) {
+      const prefix = stdout.toString().trim();
+      // npm global bins land in prefix/bin on unix, prefix on windows
+      const globalBin = path.join(prefix, 'bin', 'claude');
+      if (fs.existsSync(globalBin)) return globalBin;
+      const globalBinWin = path.join(prefix, 'claude');
+      if (fs.existsSync(globalBinWin)) return globalBinWin;
+    }
+  } catch (e) {}
+
+  // 4. Resolve via require (finds the package even if bin symlink is missing)
+  try {
+    const claudePkg = path.dirname(require.resolve('@anthropic-ai/claude-code/package.json'));
+    const pkg = JSON.parse(fs.readFileSync(path.join(claudePkg, 'package.json'), 'utf8'));
+    const binEntry = typeof pkg.bin === 'string' ? pkg.bin : (pkg.bin && pkg.bin.claude);
+    if (binEntry) {
+      const resolved = path.join(claudePkg, binEntry);
+      if (fs.existsSync(resolved)) return resolved;
+    }
+  } catch (e) {}
+
+  // 5. Fall back to global PATH
+  try {
+    const { status, stdout } = spawnSync('which', ['claude'], { stdio: 'pipe' });
+    if (status === 0 && stdout.toString().trim()) return 'claude';
+  } catch (e) {}
+
+  return null;
+}
+
+const CLAUDE_BIN = resolveClaudeBin();
 
 // ═══════════════════════════════════════════════════════════════
 //  STATE
@@ -135,7 +184,8 @@ function printHeader() {
   console.log('');
   console.log(`  ${C.dim}Session:${C.reset}  ${SESSION_ID.slice(0, 8)}`);
   console.log(`  ${C.dim}Dir:${C.reset}      ${WORKSPACE}`);
-  console.log(`  ${C.dim}Knoxis:${C.reset}   Groq (${GROQ_MODEL})`);
+  const groqMode = (BACKEND_URL && USER_ID) ? `via backend` : 'direct API';
+  console.log(`  ${C.dim}Knoxis:${C.reset}   Groq (${GROQ_MODEL}, ${groqMode})`);
   console.log(`  ${C.dim}Claude:${C.reset}   Claude Code (session-persistent)`);
   console.log(`  ${C.dim}Log:${C.reset}      ${path.basename(logFile)}`);
   console.log('');
@@ -293,12 +343,19 @@ PERSONALITY: Direct, technical, efficient. You're a developer talking to a devel
 
 function callGroq(messages, projectContext) {
   return new Promise((resolve, reject) => {
-    if (!GROQ_API_KEY) {
-      reject(new Error('GROQ_API_KEY not set'));
+    const useBackend = BACKEND_URL && USER_ID;
+    const useDirectGroq = GROQ_API_KEY && !useBackend;
+
+    if (!useBackend && !useDirectGroq) {
+      reject(new Error(
+        'No Groq access configured.\n' +
+        '  Option 1 (recommended): Set backendUrl + userId in ~/.knoxis/config.json\n' +
+        '  Option 2 (direct): Set GROQ_API_KEY env var or groqApiKey in config.json'
+      ));
       return;
     }
 
-    const payload = JSON.stringify({
+    const groqPayload = {
       model: GROQ_MODEL,
       messages: [
         { role: 'system', content: buildSystemPrompt(projectContext) },
@@ -307,20 +364,51 @@ function callGroq(messages, projectContext) {
       temperature: 0.3,
       max_tokens: 2048,
       response_format: { type: 'json_object' }
-    });
-
-    const options = {
-      hostname: 'api.groq.com',
-      path: '/openai/v1/chat/completions',
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${GROQ_API_KEY}`,
-        'Content-Length': Buffer.byteLength(payload)
-      }
     };
 
-    const req = https.request(options, (res) => {
+    // If backend is available, route through the proxy (no local key needed)
+    if (useBackend) {
+      groqPayload.userId = USER_ID;
+    }
+
+    const payload = JSON.stringify(groqPayload);
+
+    let options;
+    if (useBackend) {
+      // Route through backend proxy
+      const backendClean = BACKEND_URL
+        .replace(/^wss:\/\//, 'https://')
+        .replace(/^ws:\/\//, 'http://')
+        .replace(/\/+$/, '');
+      const url = new URL(backendClean + '/api/knoxis/collab/chat');
+      options = {
+        hostname: url.hostname,
+        port: url.port || (url.protocol === 'https:' ? 443 : 80),
+        path: url.pathname,
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': Buffer.byteLength(payload)
+        }
+      };
+    } else {
+      // Direct Groq API call (legacy / developer override)
+      options = {
+        hostname: 'api.groq.com',
+        path: '/openai/v1/chat/completions',
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${GROQ_API_KEY}`,
+          'Content-Length': Buffer.byteLength(payload)
+        }
+      };
+    }
+
+    const transport = options.hostname === 'localhost' || options.port === 80
+      ? require('http') : https;
+
+    const req = transport.request(options, (res) => {
       let data = '';
       res.on('data', chunk => data += chunk);
       res.on('end', () => {
@@ -373,8 +461,7 @@ function callGroq(messages, projectContext) {
 // ═══════════════════════════════════════════════════════════════
 
 function checkClaudeInstalled() {
-  const result = spawnSync('which', ['claude'], { stdio: 'pipe' });
-  return result.status === 0;
+  return CLAUDE_BIN !== null;
 }
 
 function dispatchToClaude(prompt) {
@@ -392,7 +479,7 @@ function dispatchToClaude(prompt) {
 
     log(`DISPATCH #${claudeDispatches}:\n${prompt}`);
 
-    const proc = spawn('claude', args, {
+    const proc = spawn(CLAUDE_BIN, args, {
       cwd: WORKSPACE,
       env: { ...process.env },
       stdio: ['pipe', 'pipe', 'pipe']
@@ -651,15 +738,20 @@ async function handleUserInput(input, rl) {
 
 async function main() {
   // Preflight checks
-  if (!GROQ_API_KEY) {
-    console.error(`\n  ${C.red}Error: GROQ_API_KEY not found.${C.reset}`);
-    console.error(`  Set it via environment variable or in ~/.knoxis/config.json\n`);
+  const hasBackend = BACKEND_URL && USER_ID;
+  const hasDirectKey = !!GROQ_API_KEY;
+
+  if (!hasBackend && !hasDirectKey) {
+    console.error(`\n  ${C.red}Error: No Groq access configured.${C.reset}`);
+    console.error(`  Set ${C.bold}backendUrl${C.reset} + ${C.bold}userId${C.reset} in ~/.knoxis/config.json (recommended)`);
+    console.error(`  Or set GROQ_API_KEY for direct access.\n`);
     process.exit(1);
   }
 
   if (!checkClaudeInstalled()) {
-    console.error(`\n  ${C.red}Error: 'claude' CLI not found in PATH.${C.reset}`);
-    console.error(`  Install Claude Code: npm install -g @anthropic-ai/claude-code\n`);
+    console.error(`\n  ${C.red}Error: 'claude' CLI not found.${C.reset}`);
+    console.error(`  It should be bundled with this package. Try: npm install`);
+    console.error(`  Or install globally: npm install -g @anthropic-ai/claude-code\n`);
     process.exit(1);
   }
 

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "knoxis-collab",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Three-way collaborative programming — User + Knoxis + Claude Code in a persistent session",
   "main": "knoxis-collab.js",
   "bin": {
     "knoxis-collab": "./knoxis-collab.js"
   },
+  "dependencies": {
+    "@anthropic-ai/claude-code": "^1.0.0"
+  },
   "keywords": [
     "knoxis",
     "pair-programming",