ccx-relay 1.8.0 → 2.1.0

package/bin/ccx-init.js

@@ -7,126 +7,222 @@ import { enhance, listModels, RateLimitError } from '../src/gemini.js';
 
 const args = process.argv.slice(2);
 
-async function promptHidden(question) {
+// ── ANSI ──────────────────────────────────────────────────────────────────────
+const c = {
+  reset: '\x1b[0m',  dim:   '\x1b[2m',   bold:  '\x1b[1m',
+  green: '\x1b[32m', red:   '\x1b[31m',  cyan:  '\x1b[36m', gray:  '\x1b[90m',
+};
+const s = {
+  active: `${c.cyan}◆${c.reset}`,  done: `${c.gray}◇${c.reset}`,
+  pipe:   `${c.gray}│${c.reset}`,   end:  `${c.gray}└${c.reset}`,
+  ok:     `${c.green}✓${c.reset}`,  err:  `${c.red}✗${c.reset}`,
+};
+
+// ── Banner ────────────────────────────────────────────────────────────────────
+function banner() {
+  const title = '  ccx-relay  ·  prompt relay setup  ';
+  const bar = '─'.repeat(title.length);
+  console.log(`\n   ╭${bar}╮`);
+  console.log(`   │${title}│`);
+  console.log(`   ╰${bar}╯\n`);
+}
+
+// ── Primitives ────────────────────────────────────────────────────────────────
+const pipe = () => console.log(s.pipe);
+const info = (m) => console.log(`${s.pipe}  ${c.dim}${m}${c.reset}`);
+const good = (m) => console.log(`${s.pipe}  ${s.ok}  ${m}`);
+const bad  = (m) => console.log(`${s.pipe}  ${s.err}  ${c.red}${m}${c.reset}`);
+const head = (label) => console.log(`${s.active}  ${c.bold}${label}${c.reset}`);
+
+// ── Hidden input (●●● masking) ────────────────────────────────────────────────
+async function promptHidden() {
   return new Promise(resolve => {
-    process.stdout.write(question);
+    process.stdout.write(`${s.pipe}  `);
     const rl = createInterface({ input: process.stdin, output: null, terminal: false });
     if (process.stdin.isTTY) process.stdin.setRawMode(true);
     let input = '';
     process.stdin.on('data', function onData(buf) {
       for (let i = 0; i < buf.length; i++) {
-        const byte = buf[i];
-        if (byte === 0x0d || byte === 0x0a) {
+        const b = buf[i];
+        if (b === 0x0d || b === 0x0a) {
           if (process.stdin.isTTY) process.stdin.setRawMode(false);
           process.stdout.write('\n');
           process.stdin.removeListener('data', onData);
           rl.close();
           resolve(input);
           return;
-        } else if (byte === 0x7f || byte === 0x08) {
+        } else if (b === 0x7f || b === 0x08) {
           if (input.length > 0) { input = input.slice(0, -1); process.stdout.write('\b \b'); }
-        } else if (byte === 0x03) {
+        } else if (b === 0x03) {
           process.exit(0);
-        } else if (byte >= 0x20) {
-          input += String.fromCharCode(byte);
-          process.stdout.write('*');
+        } else if (b >= 0x20) {
+          input += String.fromCharCode(b);
+          process.stdout.write(`${c.dim}●${c.reset}`);
         }
       }
     });
   });
 }
 
-async function prompt(rl, question) {
-  return new Promise(resolve => rl.question(question, resolve));
-}
-
-function maskKey(key) {
-  if (!key) return '(not set)';
-  if (key.length <= 6) return key + '****...';
-  return key.slice(0, 6) + '****...';
+// ── Plain prompt ──────────────────────────────────────────────────────────────
+async function ask(question, defaultVal = '') {
+  return new Promise(resolve => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(question, answer => {
+      rl.close();
+      resolve(answer.trim() || defaultVal);
+    });
+  });
 }
 
-function showConfig() {
-  const config = load();
-  const path = configPath();
-  console.log(`Config: ${path}\n`);
-  console.log(`  geminiApiKey:   ${maskKey(config.geminiApiKey)}`);
-  console.log(`  geminiModel:    ${config.geminiModel}`);
-  console.log(`  marker:         ${config.marker}`);
-  console.log(`  timeoutSeconds: ${config.timeoutSeconds}`);
+// ── Spinner ───────────────────────────────────────────────────────────────────
+const FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
+function spin(msg) {
+  let f = 0;
+  process.stdout.write(`${s.pipe}  `);
+  const id = setInterval(() => {
+    process.stdout.write(`\r${s.pipe}  ${c.dim}${FRAMES[f++ % FRAMES.length]}${c.reset}  ${msg}`);
+  }, 80);
+  return () => { clearInterval(id); process.stdout.write('\r\x1b[2K'); };
 }
 
-function resetConfig() {
-  const path = configPath();
-  if (existsSync(path)) {
-    rmSync(path);
-    console.log('Config reset. Run `ccx-init` to set up again.');
-  } else {
-    console.log('No config file found — nothing to reset.');
-  }
+// ── Model metadata ────────────────────────────────────────────────────────────
+const MODEL_META = {
+  'llama-3.1-8b-instant':    { note: 'fastest',  quota: '14,400/day' },
+  'llama-3.3-70b-versatile': { note: 'smarter',  quota: ' 1,000/day' },
+  'gemma2-9b-it':            { note: 'balanced', quota: '14,400/day' },
+  'llama3-8b-8192':          { note: 'classic',  quota: '14,400/day' },
+  'llama-3.1-70b-versatile': { note: 'large',    quota: ' 1,000/day' },
+  'gemini-2.5-flash':        { note: 'latest',   quota: 'limited'    },
+  'gemini-2.0-flash-lite':   { note: 'fast',     quota: 'limited'    },
+  'gemini-1.5-flash':        { note: 'stable',   quota: '1,500/day'  },
+  'gemini-2.5-pro':          { note: 'powerful', quota: 'limited'    },
+};
+
+function modelRow(m, i, isDefault) {
+  const meta = MODEL_META[m] || { note: '', quota: '' };
+  const num  = `${i + 1}`.padStart(2);
+  const name = m.padEnd(34);
+  const note = meta.note.padEnd(10);
+  const tag  = isDefault ? `  ${c.dim}← default${c.reset}` : '';
+  return `${s.pipe}  ${c.dim}${num}${c.reset}  ${name}${c.dim}${note}  ${meta.quota}${c.reset}${tag}`;
 }
 
+// ── Wizard ────────────────────────────────────────────────────────────────────
 async function runWizard() {
-  console.log('\n  Welcome to ccx setup\n');
-
-  const key = await promptHidden('  API key: ');
-  if (!key) { console.log('No key entered. Aborting.'); process.exit(1); }
-
+  banner();
+
+  // ── Key ──
+  head('API key');
+  info('Groq (gsk_...)   → 14,400 req/day free  ← recommended');
+  info('Gemini (AIza...) → limited free tier');
+  pipe();
+
+  const key = await promptHidden();
+  if (!key) { bad('No key entered.'); process.exit(1); }
+  const provider = key.startsWith('gsk_') ? 'Groq' : 'Gemini';
+  pipe();
+
+  // ── Validate ──
+  head(`Validating ${provider} key`);
+  const stopValidate = spin('Connecting...');
   const testModel = key.startsWith('gsk_') ? 'llama-3.1-8b-instant' : 'gemini-2.5-flash';
-  process.stdout.write('  Testing key... ');
   try {
     await enhance('hello', { geminiApiKey: key, geminiModel: testModel, timeoutSeconds: 10 });
-    console.log('\x1b[32m✓ Valid\x1b[0m');
+    stopValidate();
+    good(`${provider} key valid`);
   } catch (err) {
     if (err instanceof RateLimitError) {
-      console.log('\x1b[32m✓ Valid\x1b[0m \x1b[2m(quota exceeded — key authenticated)\x1b[0m');
+      stopValidate();
+      good(`${provider} key valid  ${c.dim}(quota hit — authenticated)${c.reset}`);
     } else {
-      console.log(`\x1b[31m✗ Invalid key\x1b[0m — ${err.message}`);
+      stopValidate();
+      bad(`Invalid key — ${err.message}`);
+      console.log(`${s.end}  Run ${c.bold}ccx-init${c.reset} again with a valid key.\n`);
       process.exit(1);
     }
   }
+  pipe();
 
-  // Fetch available models, fall back to hardcoded list
+  // ── Models ──
+  head('Model');
+  const stopFetch = spin('Fetching available models...');
   let models;
-  process.stdout.write('  Fetching available models... ');
   try {
     const all = await listModels(key);
-    models = all.filter(m => m.includes('gemini')).slice(0, 10);
-    if (models.length === 0) throw new Error('empty');
-    console.log(`\x1b[32m✓\x1b[0m ${models.length} found`);
+    models = all.slice(0, 8);
+    if (!models.length) throw new Error('empty');
+    stopFetch();
   } catch (_) {
-    models = ['gemini-2.5-flash', 'gemini-1.5-flash', 'gemini-2.5-pro'];
-    console.log('(using defaults)');
+    stopFetch();
+    models = key.startsWith('gsk_')
+      ? ['llama-3.1-8b-instant', 'llama-3.3-70b-versatile', 'gemma2-9b-it', 'llama3-8b-8192']
+      : ['gemini-2.5-flash', 'gemini-2.0-flash-lite', 'gemini-1.5-flash', 'gemini-2.5-pro'];
   }
 
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  models.forEach((m, i) => console.log(modelRow(m, i, i === 0)));
+  pipe();
 
-  console.log('');
-  console.log('  Model:');
-  models.forEach((m, i) => {
-    console.log(`  ${i + 1}) ${m}${i === 0 ? ' (default)' : ''}`);
-  });
-
-  const modelChoice = await prompt(rl, '  Choice [1]: ');
-  const idx = parseInt(modelChoice.trim(), 10);
-  const modelIndex = (!idx || idx < 1 || idx > models.length) ? 0 : idx - 1;
+  const modelInput = await ask(`${s.pipe}  Choice ${c.dim}[1]${c.reset}: `, '1');
+  const mIdx = parseInt(modelInput, 10);
+  const modelIndex = (!mIdx || mIdx < 1 || mIdx > models.length) ? 0 : mIdx - 1;
   const model = models[modelIndex];
+  good(model);
+  pipe();
+
+  // ── Marker ──
+  head('Trigger marker');
+  info('Type at end of your prompt + Enter to enhance  (Alt+M also works anywhere)');
+  const marker = await ask(`${s.pipe}  Default ${c.dim}[;;]${c.reset}: `, ';;');
+  pipe();
+
+  // ── Timeout ──
+  head('Request timeout');
+  info('Seconds before giving up and restoring original text');
+  const timeoutInput = await ask(`${s.pipe}  Default ${c.dim}[8]${c.reset}: `, '8');
+  const timeoutSeconds = parseInt(timeoutInput, 10) || 8;
+  pipe();
+
+  // ── Save ──
+  save({ geminiApiKey: key, geminiModel: model, marker, timeoutSeconds });
+  const path = configPath();
+  console.log(`${s.end}  ${s.ok}  ${c.bold}${c.green}Config saved${c.reset}`);
+  console.log(`      ${c.dim}${path}${c.reset}`);
+  console.log(`\n      Run  ${c.bold}ccx claude${c.reset}  to start\n`);
+}
 
-  const markerAnswer = await prompt(rl, '  Trigger marker [;;]: ');
-  const marker = markerAnswer.trim() || ';;';
-
-  const timeoutAnswer = await prompt(rl, '  Timeout seconds [8]: ');
-  const timeoutSeconds = timeoutAnswer.trim() === '' ? 8 : (parseInt(timeoutAnswer, 10) || 8);
+// ── Sub-commands ──────────────────────────────────────────────────────────────
+function maskKey(key) {
+  if (!key) return '(not set)';
+  return key.slice(0, 6) + '****...';
+}
 
-  rl.close();
+function showConfig() {
+  const cfg = load();
+  const path = configPath();
+  const provider = cfg.geminiApiKey?.startsWith('gsk_') ? 'Groq' : 'Gemini';
+  banner();
+  console.log(`${s.pipe}  ${c.dim}Path${c.reset}      ${path}`);
+  console.log(`${s.pipe}  ${c.dim}Provider${c.reset}  ${provider}`);
+  console.log(`${s.pipe}  ${c.dim}Key${c.reset}       ${maskKey(cfg.geminiApiKey)}`);
+  console.log(`${s.pipe}  ${c.dim}Model${c.reset}     ${cfg.geminiModel}`);
+  console.log(`${s.pipe}  ${c.dim}Marker${c.reset}    ${cfg.marker}`);
+  console.log(`${s.end}  ${c.dim}Timeout${c.reset}   ${cfg.timeoutSeconds}s\n`);
+}
 
-  save({ geminiApiKey: key, geminiModel: model, marker, timeoutSeconds });
-  console.log(`\n  Config saved to ${configPath()}`);
-  console.log('  Run `ccx claude` to start.\n');
+function resetConfig() {
+  const path = configPath();
+  if (existsSync(path)) {
+    rmSync(path);
+    console.log(`${s.ok}  Config reset. Run ${c.bold}ccx-init${c.reset} to set up again.`);
+  } else {
+    console.log('No config file found — nothing to reset.');
+  }
 }
 
+// ── Entry ─────────────────────────────────────────────────────────────────────
 if (args.length === 0) {
-  runWizard();
+  runWizard().catch(err => { console.error(err.message); process.exit(1); });
 } else if (args[0] === '--show') {
   showConfig();
 } else if (args[0] === '--reset') {

package/bin/ccx.js

@@ -116,6 +116,20 @@ process.stdout.on('resize', () => {
 process.stdin.setRawMode(true);
 process.stdin.resume();
 
+function eraseInput(line, cursor) {
+  const parts = line.split('\n');
+  const extraLines = parts.length - 1;
+  if (extraLines === 0) {
+    const charsAfterCursor = line.length - cursor;
+    if (charsAfterCursor > 0) ptyProcess.write(`\x1b[${charsAfterCursor}C`);
+    ptyProcess.write(Buffer.alloc(line.length, 0x7f));
+  } else {
+    ptyProcess.write('\x1b[2K');
+    for (let i = 0; i < extraLines; i++) ptyProcess.write('\x1b[1A\x1b[2K');
+    ptyProcess.write('\x1b[G');
+  }
+}
+
 const handler = createInputHandler({
   marker: config.marker,
 
@@ -135,20 +149,14 @@ const handler = createInputHandler({
       else if (err instanceof TimeoutError) msg = `Timed out after ${config.timeoutSeconds}s — original restored`;
       else if (err instanceof NetworkError) msg = 'No connection — original restored';
       await spinnerStop('error', msg);
-      // Move cursor to end of line then erase, restore original
-      const charsAfterCursor = line.length - cursor;
-      if (charsAfterCursor > 0) ptyProcess.write(`\x1b[${charsAfterCursor}C`);
-      ptyProcess.write(Buffer.alloc(line.length, 0x7f));
+      eraseInput(line, cursor);
       ptyProcess.write(toSend);
       handler.setBusy(false);
       handler.setLine(toSend);
       return;
     }
     await spinnerStop('success', 'Enhanced');
-    // Move cursor to end of line then erase, write improved
-    const charsAfterCursor = line.length - cursor;
-    if (charsAfterCursor > 0) ptyProcess.write(`\x1b[${charsAfterCursor}C`);
-    ptyProcess.write(Buffer.alloc(line.length, 0x7f));
+    eraseInput(line, cursor);
     ptyProcess.write(improved);
     handler.setBusy(false);
     handler.setLine(improved);

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "ccx-relay",
-  "version": "1.8.0",
+  "version": "2.1.0",
   "description": "Transparent PTY wrapper for Claude Code (or any CLI) that lets you refine your prompt with Gemini AI before submitting it, without leaving your terminal session.",
   "main": "bin/ccx.js",
   "bin": {

package/src/gemini.js

@@ -7,11 +7,11 @@ export class NetworkError extends Error {}
 const SYSTEM_PROMPT =
   'Rewrite the following text to be grammatically correct and clearer, ' +
   'while preserving its original intent and meaning exactly. ' +
-  'This is a single line typed into a terminal prompt, not a chat message - ' +
-  'respond with EXACTLY ONE rewritten version as a single plain-text line. ' +
+  'This is text typed into a terminal prompt — it may be one line or multiple lines. ' +
+  'Respond with EXACTLY ONE rewritten version preserving the same line structure and count. ' +
   'Do not offer multiple options or alternatives. Do not add headings, bullet ' +
   'points, markdown formatting, quotes, explanations, or any commentary. ' +
-  'Output must contain nothing but the rewritten line itself.';
+  'Output must contain nothing but the rewritten text itself.';
 
 function isGroq(apiKey) { return apiKey.startsWith('gsk_'); }
 
@@ -78,7 +78,7 @@ async function enhanceGroq(text, config, context) {
           { role: 'system', content: SYSTEM_PROMPT },
           { role: 'user', content: userContent },
         ],
-        max_tokens: 256,
+        max_tokens: 2048,
       }),
     });
 

package/src/input.js

@@ -55,7 +55,11 @@ export function createInputHandler({ marker, onEnhance, onSubmit, onPassthrough,
         if (seq !== null) {
           if (seq.kd === 1) {
             if (seq.vk === 13) {
-              if (lineBuffer.endsWith(marker) && lineBuffer.trim().length > marker.length) {
+              if (seq.cs & 0x0010) {
+                // Shift+Enter: append newline, accumulate multi-line buffer
+                lineBuffer += '\n';
+                cursor = lineBuffer.length;
+              } else if (lineBuffer.endsWith(marker) && lineBuffer.trim().length > marker.length) {
                 onEnhance(lineBuffer, cursor);
                 return;
               } else {