codepolisher-cli 1.2.0 → 1.3.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 ImPerial TeK. Solutions
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 ImPerial TeK. Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -6,7 +6,7 @@
 
 [![Node.js 18+](https://img.shields.io/badge/node.js-18+-6366f1?style=for-the-badge&logo=nodedotjs&logoColor=white)](https://nodejs.org/)
 [![License: MIT](https://img.shields.io/badge/license-MIT-a855f7?style=for-the-badge)](LICENSE)
-[![Tests](https://img.shields.io/badge/tests-10%20passing-22c55e?style=for-the-badge&logo=githubactions&logoColor=white)](https://github.com/v1ral-ITS/codepolisher-cli/actions/workflows/test.yml)
+[![Tests](https://img.shields.io/badge/tests-4%20passing-22c55e?style=for-the-badge&logo=githubactions&logoColor=white)](https://github.com/v1ral-ITS/codepolisher-cli/actions/workflows/test.yml)
 [![Providers](https://img.shields.io/badge/AI%20providers-8-f59e0b?style=for-the-badge)](#supported-providers)
 [![npm](https://img.shields.io/npm/v/codepolisher-cli?style=for-the-badge&logo=npm&logoColor=white&color=cb3837)](https://www.npmjs.com/package/codepolisher-cli)
 [![npm downloads](https://img.shields.io/npm/dm/codepolisher-cli?style=for-the-badge&color=3b82f6)](https://www.npmjs.com/package/codepolisher-cli)
@@ -37,7 +37,7 @@
 
 ## How it works
 
-CodePolisher reads a file or standard input, builds a focused review prompt, sends it directly to your selected provider, and renders structured findings for a human or CI pipeline. Every review renders the original and the AI-suggested correction side by side, line by line.
+CodePolisher reads a file or standard input, builds a focused review prompt, sends it directly to your selected provider, and renders structured findings for a human or CI pipeline. Every terminal review shows the original and AI-suggested correction side by side. After reviewing the comparison, you can save the corrected script under a new filename without changing the original.
 
 ```
   Source Code           Review Pipeline             Result
@@ -110,11 +110,15 @@ codepolisher review server.js --security
 # Apply project-specific rules
 codepolisher review api.ts --rules "Require error handling and input validation."
 
-# Emit machine-readable output for CI
-codepolisher review app.js --output json --fail-on-critical
-
+# Emit machine-readable output for CI
+codepolisher review app.js --output json --fail-on-critical
+
+# Save the suggested correction without an interactive prompt
+codepolisher review app.js --save-as app.fixed.js
 ```
 
+For an interactive file review, CodePolisher asks whether you want to save the suggested correction after displaying it. Press Enter to keep the original unchanged, or answer `y` and accept the suggested `*.polished.*` filename (or enter another new filename). Existing files are never overwritten.
+
 ### Review controls
 
 | Option | Purpose |
@@ -124,8 +128,9 @@ codepolisher review app.js --output json --fail-on-critical
 | `--rules <text>` | Add custom review rules |
 | `--strict` | Flag every issue |
 | `--security` | Run a security-focused audit |
-| `--output json` | Produce JSON for scripts and CI |
-| `--fail-on-critical` | Exit with code 1 when critical issues are found |
+| `--output json` | Produce JSON for scripts and CI |
+| `--save-as <file>` | Save the suggested correction to a new file without prompting |
+| `--fail-on-critical` | Exit with code 1 when critical issues are found |
 
 ---
 
@@ -169,16 +174,18 @@ bin/
 src/
 ├── index.js                 # Commander program and commands
 ├── api.js                   # Provider adapters and response parsing
-├── config.js                # Provider detection and secure local config
-├── prompt.js                # Review and security prompt builders
-├── comparison.js            # Line alignment and safe side-by-side comparisons
-├── display.js               # Human-readable terminal output
+├── config.js                # Provider detection and secure local config
+├── prompt.js                # Review and security prompt builders
+├── comparison.js            # Line alignment and safe side-by-side comparisons
+├── display.js               # Human-readable terminal output
+├── save-correction.js       # Safe corrected-script filenames and writes
 └── commands/
     ├── review.js            # File/stdin review workflow
     └── config-cmd.js        # Configuration commands
-test/
-├── comparison.test.js       # Comparison, normalization, and terminal safety tests
-└── providers.test.js        # Provider endpoint and environment tests
+test/
+├── comparison.test.js       # Comparison, normalization, and terminal safety tests
+├── providers.test.js        # Provider endpoint and environment tests
+└── save-correction.test.js  # Corrected-script save safety tests
 ```
 
 </details>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codepolisher-cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Provider-independent AI code review in your terminal",
   "keywords": [
     "ai",

package/src/commands/review.js

@@ -1,87 +1,104 @@
-import { readFileSync } from 'fs';
-import { basename } from 'path';
-import ora from 'ora';
-import { requireConfig } from '../config.js';
-import { invokeLLM } from '../api.js';
-import { buildReviewPrompt, buildSecurityPrompt } from '../prompt.js';
-import { normalizeCorrectedCode } from '../comparison.js';
-import {
-  printHeader,
-  printSummary,
-  printComments,
-  printComparison,
-  printFooter,
-  printError,
-} from '../display.js';
-
-export async function reviewCommand(filePath, options) {
-  const config = requireConfig();
-
-  // Read code
-  let code, filename;
-  if (filePath) {
-    try {
-      code = readFileSync(filePath, 'utf8');
-      filename = basename(filePath);
-    } catch {
-      printError(`Could not read file: ${filePath}`);
-      process.exit(1);
-    }
-  } else {
-    // Read from stdin
-    code = readFileSync(0, 'utf8');
-    filename = null;
-  }
-
-  if (!code.trim()) {
-    printError('No code to review.');
-    process.exit(1);
-  }
-
-  // Build settings from flags
-  const settings = {
-    focusAreas: options.focus ? options.focus.split(',').map(s => s.trim()) : [],
-    customRules: options.rules || '',
-    strictMode: !!options.strict,
-  };
-
-  const prompt = options.security
-    ? buildSecurityPrompt(code, options.language || 'auto', filename)
-    : buildReviewPrompt(code, options.language || 'auto', filename, settings);
-
-  const codeLines = code.split('\n').length;
-
-  const spinner = ora(`Reviewing with ${config.provider}…`).start();
-
-  let results;
-  try {
-    results = await invokeLLM(config, {
-      prompt,
-      codeLines,
-    });
-    spinner.stop();
-  } catch (err) {
-    spinner.stop();
-    printError(`Review failed: ${err.message || err}`);
-    process.exit(1);
-  }
-
-  // JSON output mode
-  if (options.output === 'json') {
-    console.log(JSON.stringify(results, null, 2));
-    return;
-  }
-
-  printHeader(filename, results.detected_language);
-  printSummary(results);
-  printComments(results.comments);
-  const correctedCode = normalizeCorrectedCode(results.corrected_code);
-  printComparison(code, correctedCode);
-  printFooter();
-
-  // Exit with non-zero if critical issues found
-  const hasCritical = results.comments?.some(c => c.severity === 'critical' || c.severity === 'security');
-  if (hasCritical && options.failOnCritical) {
-    process.exit(1);
-  }
-}
+import { readFileSync } from 'fs';
+import { basename } from 'path';
+import ora from 'ora';
+import { requireConfig } from '../config.js';
+import { invokeLLM } from '../api.js';
+import { buildReviewPrompt, buildSecurityPrompt } from '../prompt.js';
+import { hasMeaningfulChanges, normalizeCorrectedCode } from '../comparison.js';
+import { promptToSaveCorrection, resolveSaveDestination, saveCorrectedCode } from '../save-correction.js';
+import {
+  printHeader,
+  printSummary,
+  printComments,
+  printComparison,
+  printFooter,
+  printError,
+} from '../display.js';
+
+export async function reviewCommand(filePath, options) {
+  const config = requireConfig();
+
+  // Read code
+  let code, filename;
+  if (filePath) {
+    try {
+      code = readFileSync(filePath, 'utf8');
+      filename = basename(filePath);
+    } catch {
+      printError(`Could not read file: ${filePath}`);
+      process.exit(1);
+    }
+  } else {
+    // Read from stdin
+    code = readFileSync(0, 'utf8');
+    filename = null;
+  }
+
+  if (!code.trim()) {
+    printError('No code to review.');
+    process.exit(1);
+  }
+
+  // Build settings from flags
+  const settings = {
+    focusAreas: options.focus ? options.focus.split(',').map(s => s.trim()) : [],
+    customRules: options.rules || '',
+    strictMode: !!options.strict,
+  };
+
+  const prompt = options.security
+    ? buildSecurityPrompt(code, options.language || 'auto', filename)
+    : buildReviewPrompt(code, options.language || 'auto', filename, settings);
+
+  const codeLines = code.split('\n').length;
+
+  const spinner = ora(`Reviewing with ${config.provider}…`).start();
+
+  let results;
+  try {
+    results = await invokeLLM(config, {
+      prompt,
+      codeLines,
+    });
+    spinner.stop();
+  } catch (err) {
+    spinner.stop();
+    printError(`Review failed: ${err.message || err}`);
+    process.exit(1);
+  }
+
+  // JSON output mode
+  if (options.output === 'json') {
+    console.log(JSON.stringify(results, null, 2));
+    return;
+  }
+
+  printHeader(filename, results.detected_language);
+  printSummary(results);
+  printComments(results.comments);
+  const correctedCode = normalizeCorrectedCode(results.corrected_code);
+  printComparison(code, correctedCode);
+  printFooter();
+
+  if (hasMeaningfulChanges(code, correctedCode)) {
+    try {
+      let savedPath = null;
+      if (options.saveAs) {
+        const destination = resolveSaveDestination(options.saveAs, filePath);
+        savedPath = await saveCorrectedCode(correctedCode, destination, filePath);
+      } else {
+        savedPath = await promptToSaveCorrection({ correctedCode, sourcePath: filePath });
+      }
+      if (savedPath) console.log(`Saved corrected script to ${savedPath}\n`);
+    } catch (error) {
+      printError(`Could not save corrected script: ${error.message || error}`);
+      process.exitCode = 1;
+    }
+  }
+
+  // Exit with non-zero if critical issues found
+  const hasCritical = results.comments?.some(c => c.severity === 'critical' || c.severity === 'security');
+  if (hasCritical && options.failOnCritical) {
+    process.exit(1);
+  }
+}

package/src/comparison.js

@@ -1,126 +1,128 @@
-const MAX_LCS_CELLS = 2_000_000;
-const ANSI_SEQUENCE = /\u001B(?:\][^\u0007]*(?:\u0007|\u001B\\)|\[[0-?]*[ -/]*[@-~]|[@-_])/g;
-
-export function sanitizeTerminalText(value) {
-  return String(value ?? '')
-    .replace(ANSI_SEQUENCE, '')
-    .replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, '');
-}
-
-export function normalizeCorrectedCode(value) {
-  const code = String(value ?? '');
-  const fenced = code.match(/^\s*```[^\n]*\n([\s\S]*?)\n```\s*$/);
-  return fenced ? fenced[1] : code;
-}
-
-export function hasMeaningfulChanges(original, corrected) {
-  if (!String(corrected ?? '').trim()) return false;
-  const normalize = (value) => String(value ?? '').replace(/\r\n/g, '\n');
-  return normalize(original) !== normalize(corrected);
-}
-
-function splitLines(value) {
-  return sanitizeTerminalText(value).replace(/\r\n/g, '\n').split('\n');
-}
-
-function fallbackRows(left, right) {
-  const rows = [];
-  const length = Math.max(left.length, right.length);
-  for (let index = 0; index < length; index += 1) {
-    const before = index < left.length ? left[index] : null;
-    const after = index < right.length ? right[index] : null;
-    rows.push({
-      kind: before === after ? 'same' : before === null ? 'added' : after === null ? 'removed' : 'changed',
-      before: before === null ? null : { number: index + 1, text: before },
-      after: after === null ? null : { number: index + 1, text: after },
-    });
-  }
-  return rows;
-}
-
-export function compareLines(original, corrected) {
-  const left = splitLines(original);
-  const right = splitLines(corrected);
-  if (left.length * right.length > MAX_LCS_CELLS) return fallbackRows(left, right);
-
-  const width = right.length + 1;
-  const table = new Uint32Array((left.length + 1) * width);
-  for (let i = left.length - 1; i >= 0; i -= 1) {
-    for (let j = right.length - 1; j >= 0; j -= 1) {
-      table[(i * width) + j] = left[i] === right[j]
-        ? table[((i + 1) * width) + j + 1] + 1
-        : Math.max(table[((i + 1) * width) + j], table[(i * width) + j + 1]);
-    }
-  }
-
-  const operations = [];
-  let i = 0;
-  let j = 0;
-  while (i < left.length && j < right.length) {
-    if (left[i] === right[j]) {
-      operations.push({ kind: 'same', number: i + 1, otherNumber: j + 1, text: left[i] });
-      i += 1;
-      j += 1;
-    } else if (table[((i + 1) * width) + j] >= table[(i * width) + j + 1]) {
-      operations.push({ kind: 'removed', number: i + 1, text: left[i] });
-      i += 1;
-    } else {
-      operations.push({ kind: 'added', number: j + 1, text: right[j] });
-      j += 1;
-    }
-  }
-  while (i < left.length) operations.push({ kind: 'removed', number: ++i, text: left[i - 1] });
-  while (j < right.length) operations.push({ kind: 'added', number: ++j, text: right[j - 1] });
-
-  const rows = [];
-  for (let cursor = 0; cursor < operations.length;) {
-    const operation = operations[cursor];
-    if (operation.kind === 'same') {
-      rows.push({
-        kind: 'same',
-        before: { number: operation.number, text: operation.text },
-        after: { number: operation.otherNumber, text: operation.text },
-      });
-      cursor += 1;
-      continue;
-    }
-
-    const removed = [];
-    const added = [];
-    while (cursor < operations.length && operations[cursor].kind !== 'same') {
-      const change = operations[cursor];
-      (change.kind === 'removed' ? removed : added).push(change);
-      cursor += 1;
-    }
-    const changeLength = Math.max(removed.length, added.length);
-    for (let changeIndex = 0; changeIndex < changeLength; changeIndex += 1) {
-      const before = removed[changeIndex] || null;
-      const after = added[changeIndex] || null;
-      rows.push({
-        kind: before && after ? 'changed' : before ? 'removed' : 'added',
-        before: before ? { number: before.number, text: before.text } : null,
-        after: after ? { number: after.number, text: after.text } : null,
-      });
-    }
-  }
-  return rows;
-}
-
-export function changedHunks(rows, context = 2) {
-  const selected = new Set();
-  rows.forEach((row, index) => {
-    if (row.kind === 'same') return;
-    for (let nearby = Math.max(0, index - context); nearby <= Math.min(rows.length - 1, index + context); nearby += 1) {
-      selected.add(nearby);
-    }
-  });
-
-  const output = [];
-  let previous = -2;
-  for (const index of [...selected].sort((a, b) => a - b)) {
-    if (index > previous + 1) output.push({ kind: 'separator', before: null, after: null });
-    output.push(rows[index]);
-    previous = index;
-  }
-  return output;
-}
+const MAX_LCS_CELLS = 2_000_000;
+const ANSI_SEQUENCE = /\u001B(?:\][^\u0007]*(?:\u0007|\u001B\\)|\[[0-?]*[ -/]*[@-~]|[@-_])/g;
+
+export function sanitizeTerminalText(value) {
+  return String(value ?? '')
+    .replace(ANSI_SEQUENCE, '')
+    .replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, '');
+}
+
+export function normalizeCorrectedCode(value) {
+  const code = String(value ?? '');
+  const fenced = code.match(/^\s*```[^\n]*\n([\s\S]*?)\n```\s*$/);
+  return fenced ? fenced[1] : code;
+}
+
+export function hasMeaningfulChanges(original, corrected) {
+  if (!String(corrected ?? '').trim()) return false;
+  const normalize = (value) => String(value ?? '').replace(/\r\n/g, '\n');
+  return normalize(original) !== normalize(corrected);
+}
+
+function splitLines(value) {
+  return sanitizeTerminalText(value).replace(/\r\n/g, '\n').split('\n');
+}
+
+function fallbackRows(left, right) {
+  const rows = [];
+  const length = Math.max(left.length, right.length);
+  for (let index = 0; index < length; index += 1) {
+    const before = index < left.length ? left[index] : null;
+    const after = index < right.length ? right[index] : null;
+    rows.push({
+      kind: before === after ? 'same' : before === null ? 'added' : after === null ? 'removed' : 'changed',
+      before: before === null ? null : { number: index + 1, text: before },
+      after: after === null ? null : { number: index + 1, text: after },
+    });
+  }
+  return rows;
+}
+
+export function compareLines(original, corrected) {
+  const left = splitLines(original);
+  const right = splitLines(corrected);
+  if (left.length * right.length > MAX_LCS_CELLS) return fallbackRows(left, right);
+
+  const width = right.length + 1;
+  const table = new Uint32Array((left.length + 1) * width);
+  for (let i = left.length - 1; i >= 0; i -= 1) {
+    for (let j = right.length - 1; j >= 0; j -= 1) {
+      table[(i * width) + j] = left[i] === right[j]
+        ? table[((i + 1) * width) + j + 1] + 1
+        : Math.max(table[((i + 1) * width) + j], table[(i * width) + j + 1]);
+    }
+  }
+
+  const operations = [];
+  let i = 0;
+  let j = 0;
+  while (i < left.length && j < right.length) {
+    if (left[i] === right[j]) {
+      operations.push({ kind: 'same', number: i + 1, otherNumber: j + 1, text: left[i] });
+      i += 1;
+      j += 1;
+    } else if (table[((i + 1) * width) + j] >= table[(i * width) + j + 1]) {
+      operations.push({ kind: 'removed', number: i + 1, text: left[i] });
+      i += 1;
+    } else {
+      operations.push({ kind: 'added', number: j + 1, text: right[j] });
+      j += 1;
+    }
+  }
+  while (i < left.length) operations.push({ kind: 'removed', number: ++i, text: left[i - 1] });
+  while (j < right.length) operations.push({ kind: 'added', number: ++j, text: right[j - 1] });
+
+  const rows = [];
+  for (let cursor = 0; cursor < operations.length;) {
+    const operation = operations[cursor];
+    if (operation.kind === 'same') {
+      rows.push({
+        kind: 'same',
+        before: { number: operation.number, text: operation.text },
+        after: { number: operation.otherNumber, text: operation.text },
+      });
+      cursor += 1;
+      continue;
+    }
+
+    const removed = [];
+    const added = [];
+    while (cursor < operations.length && operations[cursor].kind !== 'same') {
+      const change = operations[cursor];
+      (change.kind === 'removed' ? removed : added).push(change);
+      cursor += 1;
+    }
+    const changeLength = Math.max(removed.length, added.length);
+    for (let changeIndex = 0; changeIndex < changeLength; changeIndex += 1) {
+      const before = removed[changeIndex] || null;
+      const after = added[changeIndex] || null;
+      rows.push({
+        kind: before && after ? 'changed' : before ? 'removed' : 'added',
+        before: before ? { number: before.number, text: before.text } : null,
+        after: after ? { number: after.number, text: after.text } : null,
+      });
+    }
+  }
+  return rows;
+}
+
+export function changedHunks(rows, context = 2) {
+  const selected = new Set();
+  rows.forEach((row, index) => {
+    if (row.kind === 'same') return;
+    for (let nearby = Math.max(0, index - context); nearby <= Math.min(rows.length - 1, index + context); nearby += 1) {
+      selected.add(nearby);
+    }
+  });
+
+  const output = [];
+  let previous = -2;
+  for (const index of [...selected].sort((a, b) => a - b)) {
+    if (output.length > 0 && index > previous + 1) {
+      output.push({ kind: 'separator', before: null, after: null });
+    }
+    output.push(rows[index]);
+    previous = index;
+  }
+  return output;
+}

package/src/display.js

@@ -1,151 +1,151 @@
-import chalk from 'chalk';
-import {
-  compareLines,
-  sanitizeTerminalText,
-} from './comparison.js';
-
-const SEVERITY_COLOR = {
-  critical:    (s) => chalk.bgRed.white.bold(` ${s.toUpperCase()} `),
-  security:    (s) => chalk.bgMagenta.white.bold(` ${s.toUpperCase()} `),
-  warning:     (s) => chalk.bgYellow.black.bold(` ${s.toUpperCase()} `),
-  suggestion:  (s) => chalk.bgBlue.white(` ${s.toUpperCase()} `),
-  performance: (s) => chalk.bgCyan.black(` ${s.toUpperCase()} `),
-  good:        (s) => chalk.bgGreen.black(` ${s.toUpperCase()} `),
-};
-
-function badge(severity) {
-  const normalized = typeof severity === 'string' && severity ? severity : 'unknown';
-  const fn = SEVERITY_COLOR[normalized] || ((s) => chalk.bgGray.white(` ${s.toUpperCase()} `));
-  return fn(normalized);
-}
-
-export function printHeader(filename, language) {
-  const lang = language ? chalk.cyan(sanitizeTerminalText(language)) : '';
-  const file = chalk.bold(sanitizeTerminalText(filename || 'stdin'));
-  console.log('');
-  console.log(chalk.dim('─'.repeat(60)));
-  console.log(`  ${chalk.bold.white('CodePolisher')}  ${file}  ${lang}`);
-  console.log(chalk.dim('─'.repeat(60)));
-}
-
-export function printSummary(results) {
-  const { summary, correction_summary: correctionSummary } = results;
-  const comments = Array.isArray(results.comments) ? results.comments : [];
-
-  const counts = {
-    critical:    comments.filter(c => c.severity === 'critical').length,
-    security:    comments.filter(c => c.severity === 'security').length,
-    warning:     comments.filter(c => c.severity === 'warning').length,
-    suggestion:  comments.filter(c => c.severity === 'suggestion' || c.severity === 'performance').length,
-    good:        comments.filter(c => c.severity === 'good').length,
-  };
-
-  console.log('');
-  console.log(
-    `  ${chalk.red.bold(counts.critical)} critical  ` +
-    `${chalk.magenta.bold(counts.security)} security  ` +
-    `${chalk.yellow.bold(counts.warning)} warnings  ` +
-    `${chalk.blue.bold(counts.suggestion)} suggestions  ` +
-    `${chalk.green.bold(counts.good)} good`
-  );
-  console.log('');
-
-  if (summary) {
-    console.log(chalk.dim('  Summary'));
-    console.log(`  ${chalk.white(sanitizeTerminalText(summary))}`);
-    console.log('');
-  }
-
-  if (correctionSummary) {
-    console.log(chalk.dim('  Correction approach'));
-    console.log(`  ${chalk.white(sanitizeTerminalText(correctionSummary))}`);
-    console.log('');
-  }
-}
-
-export function printComments(comments = []) {
-  if (!Array.isArray(comments)) comments = [];
-  if (!comments.length) {
-    console.log(chalk.green('  No issues found.'));
-    return;
-  }
-
-  const order = ['critical', 'security', 'warning', 'performance', 'suggestion', 'good'];
-  const sorted = [...comments].sort((a, b) => {
-    return order.indexOf(a.severity) - order.indexOf(b.severity);
-  });
-
-  console.log(chalk.dim('  Issues'));
-  console.log('');
-
-  for (const c of sorted) {
-    const line = c.line ? chalk.dim(`line ${c.line}`) : chalk.dim('general');
-    console.log(`  ${badge(c.severity)}  ${line}`);
-    console.log(`  ${chalk.white(sanitizeTerminalText(c.message))}`);
-    if (c.impact) {
-      console.log(`  ${chalk.dim('why it matters:')} ${chalk.white(sanitizeTerminalText(c.impact))}`);
-    }
-    if (c.fix) {
-      console.log(`  ${chalk.dim('recommended change:')} ${chalk.cyan(sanitizeTerminalText(c.fix))}`);
-    }
-    console.log('');
-  }
-}
-
-function truncate(value, width) {
-  if (value.length <= width) return value.padEnd(width);
-  if (width <= 1) return value.slice(0, width);
-  return `${value.slice(0, width - 1)}…`;
-}
-
-function comparisonCell(line, marker, width) {
-  if (!line) return ' '.repeat(width);
-  const prefix = `${String(line.number).padStart(4)} ${marker} `;
-  return prefix + truncate(line.text.replace(/\t/g, '  '), Math.max(1, width - prefix.length));
-}
-
-export function printComparison(original, corrected, columns = process.stdout.columns || 120) {
-  if (!String(corrected ?? '').trim()) {
-    console.log(chalk.yellow('  The provider did not return a corrected script.'));
-    console.log('');
-    return;
-  }
-
-  const rows = compareLines(original, corrected);
-  const visibleRows = rows.length <= 400
-    ? rows
-    : [
-        ...rows.slice(0, 200),
-        { kind: 'separator', before: null, after: null, omitted: rows.length - 400 },
-        ...rows.slice(-200),
-      ];
-  const displayWidth = Math.min(Math.max(columns, 80), 200);
-  const cellWidth = Math.max(36, Math.floor((displayWidth - 5) / 2));
-  console.log(chalk.dim('  Side-by-side comparison (original vs. AI-suggested correction)'));
-  console.log(`  ${chalk.bold(truncate('ORIGINAL', cellWidth))}  |  ${chalk.bold(truncate('CORRECTED', cellWidth))}`);
-  console.log(`  ${'-'.repeat(cellWidth)}--+--${'-'.repeat(cellWidth)}`);
-
-  for (const row of visibleRows) {
-    if (row.kind === 'separator') {
-      const label = row.omitted ? `… ${row.omitted} comparison rows omitted …` : '…';
-      console.log(chalk.dim(`  ${truncate(label, cellWidth)}  |  ${truncate(label, cellWidth)}`));
-      continue;
-    }
-    const left = comparisonCell(row.before, row.kind === 'same' ? ' ' : '-', cellWidth);
-    const right = comparisonCell(row.after, row.kind === 'same' ? ' ' : '+', cellWidth);
-    const color = row.kind === 'same' ? chalk.dim : row.kind === 'changed' ? chalk.yellow : chalk.cyan;
-    console.log(`  ${color(left)}  |  ${color(right)}`);
-  }
-  console.log('');
-  console.log(chalk.dim('  Review this suggestion before using it in production.'));
-  console.log('');
-}
-
-export function printFooter() {
-  console.log(chalk.dim('─'.repeat(60)));
-  console.log('');
-}
-
-export function printError(msg) {
-  console.error(`\n${chalk.red.bold('Error:')} ${sanitizeTerminalText(msg)}\n`);
-}
+import chalk from 'chalk';
+import {
+  compareLines,
+  sanitizeTerminalText,
+} from './comparison.js';
+
+const SEVERITY_COLOR = {
+  critical:    (s) => chalk.bgRed.white.bold(` ${s.toUpperCase()} `),
+  security:    (s) => chalk.bgMagenta.white.bold(` ${s.toUpperCase()} `),
+  warning:     (s) => chalk.bgYellow.black.bold(` ${s.toUpperCase()} `),
+  suggestion:  (s) => chalk.bgBlue.white(` ${s.toUpperCase()} `),
+  performance: (s) => chalk.bgCyan.black(` ${s.toUpperCase()} `),
+  good:        (s) => chalk.bgGreen.black(` ${s.toUpperCase()} `),
+};
+
+function badge(severity) {
+  const normalized = typeof severity === 'string' && severity ? severity : 'unknown';
+  const fn = SEVERITY_COLOR[normalized] || ((s) => chalk.bgGray.white(` ${s.toUpperCase()} `));
+  return fn(normalized);
+}
+
+export function printHeader(filename, language) {
+  const lang = language ? chalk.cyan(sanitizeTerminalText(language)) : '';
+  const file = chalk.bold(sanitizeTerminalText(filename || 'stdin'));
+  console.log('');
+  console.log(chalk.dim('─'.repeat(60)));
+  console.log(`  ${chalk.bold.white('CodePolisher')}  ${file}  ${lang}`);
+  console.log(chalk.dim('─'.repeat(60)));
+}
+
+export function printSummary(results) {
+  const { summary, correction_summary: correctionSummary } = results;
+  const comments = Array.isArray(results.comments) ? results.comments : [];
+
+  const counts = {
+    critical:    comments.filter(c => c.severity === 'critical').length,
+    security:    comments.filter(c => c.severity === 'security').length,
+    warning:     comments.filter(c => c.severity === 'warning').length,
+    suggestion:  comments.filter(c => c.severity === 'suggestion' || c.severity === 'performance').length,
+    good:        comments.filter(c => c.severity === 'good').length,
+  };
+
+  console.log('');
+  console.log(
+    `  ${chalk.red.bold(counts.critical)} critical  ` +
+    `${chalk.magenta.bold(counts.security)} security  ` +
+    `${chalk.yellow.bold(counts.warning)} warnings  ` +
+    `${chalk.blue.bold(counts.suggestion)} suggestions  ` +
+    `${chalk.green.bold(counts.good)} good`
+  );
+  console.log('');
+
+  if (summary) {
+    console.log(chalk.dim('  Summary'));
+    console.log(`  ${chalk.white(sanitizeTerminalText(summary))}`);
+    console.log('');
+  }
+
+  if (correctionSummary) {
+    console.log(chalk.dim('  Correction approach'));
+    console.log(`  ${chalk.white(sanitizeTerminalText(correctionSummary))}`);
+    console.log('');
+  }
+}
+
+export function printComments(comments = []) {
+  if (!Array.isArray(comments)) comments = [];
+  if (!comments.length) {
+    console.log(chalk.green('  No issues found.'));
+    return;
+  }
+
+  const order = ['critical', 'security', 'warning', 'performance', 'suggestion', 'good'];
+  const sorted = [...comments].sort((a, b) => {
+    return order.indexOf(a.severity) - order.indexOf(b.severity);
+  });
+
+  console.log(chalk.dim('  Issues'));
+  console.log('');
+
+  for (const c of sorted) {
+    const line = c.line ? chalk.dim(`line ${c.line}`) : chalk.dim('general');
+    console.log(`  ${badge(c.severity)}  ${line}`);
+    console.log(`  ${chalk.white(sanitizeTerminalText(c.message))}`);
+    if (c.impact) {
+      console.log(`  ${chalk.dim('why it matters:')} ${chalk.white(sanitizeTerminalText(c.impact))}`);
+    }
+    if (c.fix) {
+      console.log(`  ${chalk.dim('recommended change:')} ${chalk.cyan(sanitizeTerminalText(c.fix))}`);
+    }
+    console.log('');
+  }
+}
+
+function truncate(value, width) {
+  if (value.length <= width) return value.padEnd(width);
+  if (width <= 1) return value.slice(0, width);
+  return `${value.slice(0, width - 1)}…`;
+}
+
+function comparisonCell(line, marker, width) {
+  if (!line) return ' '.repeat(width);
+  const prefix = `${String(line.number).padStart(4)} ${marker} `;
+  return prefix + truncate(line.text.replace(/\t/g, '  '), Math.max(1, width - prefix.length));
+}
+
+export function printComparison(original, corrected, columns = process.stdout.columns || 120) {
+  if (!String(corrected ?? '').trim()) {
+    console.log(chalk.yellow('  The provider did not return a corrected script.'));
+    console.log('');
+    return;
+  }
+
+  const rows = compareLines(original, corrected);
+  const visibleRows = rows.length <= 400
+    ? rows
+    : [
+        ...rows.slice(0, 200),
+        { kind: 'separator', before: null, after: null, omitted: rows.length - 400 },
+        ...rows.slice(-200),
+      ];
+  const displayWidth = Math.min(Math.max(columns, 80), 200);
+  const cellWidth = Math.max(36, Math.floor((displayWidth - 5) / 2));
+  console.log(chalk.dim('  Side-by-side comparison (original vs. AI-suggested correction)'));
+  console.log(`  ${chalk.bold(truncate('ORIGINAL', cellWidth))}  |  ${chalk.bold(truncate('CORRECTED', cellWidth))}`);
+  console.log(`  ${'-'.repeat(cellWidth)}--+--${'-'.repeat(cellWidth)}`);
+
+  for (const row of visibleRows) {
+    if (row.kind === 'separator') {
+      const label = row.omitted ? `… ${row.omitted} comparison rows omitted …` : '…';
+      console.log(chalk.dim(`  ${truncate(label, cellWidth)}  |  ${truncate(label, cellWidth)}`));
+      continue;
+    }
+    const left = comparisonCell(row.before, row.kind === 'same' ? ' ' : '-', cellWidth);
+    const right = comparisonCell(row.after, row.kind === 'same' ? ' ' : '+', cellWidth);
+    const color = row.kind === 'same' ? chalk.dim : row.kind === 'changed' ? chalk.yellow : chalk.cyan;
+    console.log(`  ${color(left)}  |  ${color(right)}`);
+  }
+  console.log('');
+  console.log(chalk.dim('  Review this suggestion before using it in production.'));
+  console.log('');
+}
+
+export function printFooter() {
+  console.log(chalk.dim('─'.repeat(60)));
+  console.log('');
+}
+
+export function printError(msg) {
+  console.error(`\n${chalk.red.bold('Error:')} ${sanitizeTerminalText(msg)}\n`);
+}

package/src/index.js

@@ -1,28 +1,29 @@
-import { Command } from 'commander';
-import { reviewCommand } from './commands/review.js';
-import { configCommand } from './commands/config-cmd.js';
-
-const program = new Command();
-
-program
-  .name('codepolisher')
-  .description('AI-powered code review in your terminal — by ImPerial TeK. Solutions')
-  .version('1.2.0');
-
-// review command
-program
-  .command('review [file]')
-  .description('Review a file (or pipe code via stdin)')
-  .option('-l, --language <lang>', 'Language hint (default: auto-detect)')
-  .option('-f, --focus <areas>', 'Comma-separated focus areas: security,performance,readability,error_handling,best_practices,testing')
-  .option('-r, --rules <text>', 'Custom review rules')
-  .option('--strict', 'Strict mode — flag every issue')
-  .option('--security', 'Run a full security audit')
-  .option('--output <format>', 'Output format: pretty (default) or json')
-  .option('--fail-on-critical', 'Exit code 1 if critical/security issues found')
-  .action(reviewCommand);
-
-// config command
-configCommand(program);
-
-program.parse(process.argv);
+import { Command } from 'commander';
+import { reviewCommand } from './commands/review.js';
+import { configCommand } from './commands/config-cmd.js';
+
+const program = new Command();
+
+program
+  .name('codepolisher')
+  .description('AI-powered code review in your terminal — by ImPerial TeK. Solutions')
+  .version('1.3.0');
+
+// review command
+program
+  .command('review [file]')
+  .description('Review a file (or pipe code via stdin)')
+  .option('-l, --language <lang>', 'Language hint (default: auto-detect)')
+  .option('-f, --focus <areas>', 'Comma-separated focus areas: security,performance,readability,error_handling,best_practices,testing')
+  .option('-r, --rules <text>', 'Custom review rules')
+  .option('--strict', 'Strict mode — flag every issue')
+  .option('--security', 'Run a full security audit')
+  .option('--output <format>', 'Output format: pretty (default) or json')
+  .option('--save-as <file>', 'Save the AI-suggested correction to a new file')
+  .option('--fail-on-critical', 'Exit code 1 if critical/security issues found')
+  .action(reviewCommand);
+
+// config command
+configCommand(program);
+
+program.parse(process.argv);

package/src/prompt.js

@@ -2,18 +2,18 @@ export const REVIEW_SCHEMA = {
   type: "object",
   properties: {
     detected_language: { type: "string" },
-    summary: { type: "string" },
-    correction_summary: { type: "string" },
+    summary: { type: "string" },
+    correction_summary: { type: "string" },
     comments: {
       type: "array",
       items: {
         type: "object",
         properties: {
           severity: { type: "string" },
-          line: { type: ["number", "null"] },
-          message: { type: "string" },
-          impact: { type: ["string", "null"] },
-          fix: { type: ["string", "null"] },
+          line: { type: ["number", "null"] },
+          message: { type: "string" },
+          impact: { type: ["string", "null"] },
+          fix: { type: ["string", "null"] },
         },
       },
     },
@@ -68,16 +68,16 @@ ${code}
 
 Provide your review as a JSON object with this exact structure:
 - "detected_language": the language you detected (string)
-- "summary": a 2-3 sentence overall assessment of the code quality
-- "correction_summary": a 2-4 sentence explanation of the correction strategy, including important behavior changes or tradeoffs
-- "comments": an array of review comments, each with:
+- "summary": a 2-3 sentence overall assessment of the code quality
+- "correction_summary": a 2-4 sentence explanation of the correction strategy, including important behavior changes or tradeoffs
+- "comments": an array of review comments, each with:
   - "severity": one of "critical", "warning", "suggestion", "performance", "security", "good"
   - "line": the line number (number or null if general)
-  - "message": a detailed, plain-language explanation of the issue or suggestion
-  - "impact": why the issue matters in practice (string or null)
-  - "fix": a concrete code fix or recommendation (string or null)
-- "corrected_code": the complete, runnable corrected script with all fixes applied; return code only, without Markdown fences`;
-}
+  - "message": a detailed, plain-language explanation of the issue or suggestion
+  - "impact": why the issue matters in practice (string or null)
+  - "fix": a concrete code fix or recommendation (string or null)
+- "corrected_code": the complete, runnable corrected script with all fixes applied; return code only, without Markdown fences`;
+}
 
 export function buildSecurityPrompt(code, language = "auto", filename = null) {
   return buildReviewPrompt(code, language, filename, {

package/src/save-correction.js

@@ -0,0 +1,67 @@
+import { constants } from 'fs';
+import { access, writeFile } from 'fs/promises';
+import { createInterface } from 'readline/promises';
+import { dirname, parse, resolve } from 'path';
+
+export function suggestedOutputPath(sourcePath) {
+  const absoluteSource = resolve(sourcePath);
+  const { dir, name, ext } = parse(absoluteSource);
+  return resolve(dir, `${name}.polished${ext}`);
+}
+
+async function pathExists(filePath) {
+  try {
+    await access(filePath, constants.F_OK);
+    return true;
+  } catch (error) {
+    if (error?.code === 'ENOENT') return false;
+    throw error;
+  }
+}
+
+export async function saveCorrectedCode(correctedCode, destinationPath, sourcePath = null) {
+  const destination = resolve(destinationPath);
+  if (sourcePath && destination === resolve(sourcePath)) {
+    throw new Error('Choose a different filename; the original file will not be overwritten.');
+  }
+
+  if (await pathExists(destination)) {
+    throw new Error(`File already exists: ${destination}`);
+  }
+
+  await writeFile(destination, correctedCode, { encoding: 'utf8', flag: 'wx' });
+  return destination;
+}
+
+export async function promptToSaveCorrection({ correctedCode, sourcePath, input = process.stdin, output = process.stdout }) {
+  if (!sourcePath || !input.isTTY || !output.isTTY) return null;
+
+  const prompt = createInterface({ input, output });
+  try {
+    const wantsSave = (await prompt.question('Would you like to save the suggested fix as a new file? (y/N) '))
+      .trim()
+      .toLowerCase();
+    if (wantsSave !== 'y' && wantsSave !== 'yes') return null;
+
+    const defaultPath = suggestedOutputPath(sourcePath);
+    while (true) {
+      const answer = (await prompt.question(`Save as [${defaultPath}]: `)).trim();
+      const destination = answer || defaultPath;
+      try {
+        return await saveCorrectedCode(correctedCode, destination, sourcePath);
+      } catch (error) {
+        output.write(`${error.message}\n`);
+      }
+    }
+  } finally {
+    prompt.close();
+  }
+}
+
+export function resolveSaveDestination(value, sourcePath = null) {
+  if (!value) return null;
+  if (sourcePath && dirname(value) === '.') {
+    return resolve(dirname(resolve(sourcePath)), value);
+  }
+  return resolve(value);
+}