x7-code-line 0.3.0 → 0.4.0

package/src/cli.js

@@ -1,5 +1,5 @@
-"use strict";
-
+"use strict";
+
 const fs = require("node:fs");
 const path = require("node:path");
 const { handlePromptSubmit, handleStop } = require("./agent-hooks");
@@ -10,139 +10,184 @@ const {
   NORMAL_DIFF_CACHE_FILE,
   PENDING_COMMIT_FILE,
   clearProjectIds,
+  findInstalledBase,
   getCacheDir,
   getProjectIds,
+  hasInstallFile,
+  readBasePointer,
   readLineIdCache
 } = require("./cache");
 const { getGitDiffLineIds } = require("./diff-lines");
-
-async function runCli(argv) {
-  const [command, ...rest] = argv;
-
-  switch (command) {
+
+async function runCli(argv) {
+  const [command, ...rest] = argv;
+
+  switch (command) {
     case "install":
-      return install(parseInstallOptions(rest));
+      return runInstall(rest);
     case "addDir":
-      return addDirs(parseInstallOptions(rest));
+      return runAddDir(rest);
     case "prompt-submit":
     case "cursor-before-submit-prompt":
     case "codex-user-prompt-submit":
-      return handlePromptSubmit();
+      return handlePromptSubmit(requireBaseDir());
     case "stop":
     case "cursor-stop":
     case "codex-stop":
-      return handleStop();
-    case "git-pre-commit":
-      return runGitPreCommit();
-    case "git-commit-msg":
-      return runGitCommitMsg(rest);
-    case "-h":
-    case "--help":
-    case undefined:
-      return printHelp();
-    default:
-      throw new Error(`Unknown command: ${command}`);
-  }
+      return handleStop(requireBaseDir());
+    case "git-pre-commit":
+      return runGitPreCommit();
+    case "git-commit-msg":
+      return runGitCommitMsg(rest);
+    case "-h":
+    case "--help":
+    case undefined:
+      return printHelp();
+    default:
+      throw new Error(`Unknown command: ${command}`);
+  }
+}
+
+function parseInstallOptions(args) {
+  const options = {
+    targetDirs: [],
+    configPath: undefined,
+    relativePaths: false
+  };
+
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === "--config" || arg === "-c") {
+      options.configPath = requireValue(args, (index += 1), arg);
+    } else if (arg === "--relative") {
+      options.relativePaths = true;
+    } else if (arg === "--dir" || arg === "-d") {
+      options.targetDirs.push(requireValue(args, (index += 1), arg));
+    } else if (arg === "--dirs") {
+      options.targetDirs.push(...requireValue(args, (index += 1), arg).split(","));
+    } else {
+      options.targetDirs.push(arg);
+    }
+  }
+
+  return options;
+}
+
+function requireValue(args, index, flag) {
+  const value = args[index];
+  if (!value || value.startsWith("-")) {
+    throw new Error(`${flag} requires a value`);
+  }
+  return value;
+}
+
+async function runGitPreCommit() {
+  const baseDir = requireBaseDir();
+  const projectDir = process.cwd();
+  const aiCache = readLineIdCache(baseDir, AI_DIFF_CACHE_FILE);
+  const normalCache = readLineIdCache(baseDir, NORMAL_DIFF_CACHE_FILE);
+  const aiIds = getProjectIds(aiCache, projectDir);
+  const stagedIds = getGitDiffLineIds(projectDir, { staged: true });
+  const aiLineCount = stagedIds.filter((id) => aiIds.has(id)).length;
+  const pendingPath = path.join(getCacheDir(baseDir), PENDING_COMMIT_FILE);
+  fs.writeFileSync(
+    pendingPath,
+    `${JSON.stringify({ projects: { [path.resolve(projectDir)]: { aiLineCount } } }, null, 2)}\n`
+  );
+  clearProjectIds(aiCache, projectDir);
+  clearProjectIds(normalCache, projectDir);
+  writeCacheFile(baseDir, AI_DIFF_CACHE_FILE, aiCache);
+  writeCacheFile(baseDir, NORMAL_DIFF_CACHE_FILE, normalCache);
+
+  if (process.env.X7_CODE_LINE_DEBUG === "1") {
+    console.error(`[x7-code-line] git pre-commit ai lines: ${aiLineCount}`);
+  }
+}
+
+async function runGitCommitMsg(args) {
+  const commitMsgPath = args[0];
+  if (!commitMsgPath) {
+    throw new Error("git-commit-msg requires a commit message file path");
+  }
+
+  appendCommitTrailer(path.resolve(commitMsgPath), readPendingAiLineCount(requireBaseDir(), process.cwd()));
 }
 
-function parseInstallOptions(args) {
-  const options = {
-    targetDirs: [],
-    configPath: undefined,
-    relativePaths: false
-  };
-
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    if (arg === "--config" || arg === "-c") {
-      options.configPath = requireValue(args, (index += 1), arg);
-    } else if (arg === "--relative") {
-      options.relativePaths = true;
-    } else if (arg === "--dir" || arg === "-d") {
-      options.targetDirs.push(requireValue(args, (index += 1), arg));
-    } else if (arg === "--dirs") {
-      options.targetDirs.push(...requireValue(args, (index += 1), arg).split(","));
-    } else {
-      options.targetDirs.push(arg);
-    }
+function requireBaseDir() {
+  const baseDir = resolveBaseDir();
+  if (!baseDir) {
+    throw new Error(
+      "Unable to locate x7-code-line install base. Run the command from the install base, or set X7_CODE_LINE_BASE."
+    );
   }
-
-  return options;
+  return baseDir;
 }
 
-function requireValue(args, index, flag) {
-  const value = args[index];
-  if (!value || value.startsWith("-")) {
-    throw new Error(`${flag} requires a value`);
+function resolveBaseDir() {
+  if (process.env.X7_CODE_LINE_BASE && hasInstallFile(process.env.X7_CODE_LINE_BASE)) {
+    return path.resolve(process.env.X7_CODE_LINE_BASE);
   }
-  return value;
-}
 
-async function runGitPreCommit() {
-  const baseDir = getBaseDir();
-  const projectDir = process.cwd();
-  const aiCache = readLineIdCache(baseDir, AI_DIFF_CACHE_FILE);
-  const normalCache = readLineIdCache(baseDir, NORMAL_DIFF_CACHE_FILE);
-  const aiIds = getProjectIds(aiCache, projectDir);
-  const stagedIds = getGitDiffLineIds(projectDir, { staged: true });
-  const aiLineCount = stagedIds.filter((id) => aiIds.has(id)).length;
-  const pendingPath = path.join(getCacheDir(baseDir), PENDING_COMMIT_FILE);
-  fs.writeFileSync(
-    pendingPath,
-    `${JSON.stringify({ projects: { [path.resolve(projectDir)]: { aiLineCount } } }, null, 2)}\n`
-  );
-  clearProjectIds(aiCache, projectDir);
-  clearProjectIds(normalCache, projectDir);
-  writeCacheFile(baseDir, AI_DIFF_CACHE_FILE, aiCache);
-  writeCacheFile(baseDir, NORMAL_DIFF_CACHE_FILE, normalCache);
-
-  if (process.env.X7_CODE_LINE_DEBUG === "1") {
-    console.error(`[x7-code-line] git pre-commit ai lines: ${aiLineCount}`);
+  const discoveredFromCwd = findInstalledBase(process.cwd());
+  if (discoveredFromCwd) {
+    return discoveredFromCwd;
   }
-}
 
-async function runGitCommitMsg(args) {
-  const commitMsgPath = args[0];
-  if (!commitMsgPath) {
-    throw new Error("git-commit-msg requires a commit message file path");
+  if (process.env.INIT_CWD) {
+    const discoveredFromInit = findInstalledBase(process.env.INIT_CWD);
+    if (discoveredFromInit) {
+      return discoveredFromInit;
+    }
   }
 
-  appendCommitTrailer(path.resolve(commitMsgPath), readPendingAiLineCount(getBaseDir(), process.cwd()));
+  return readBasePointer();
 }
 
-function getBaseDir() {
-  return process.env.X7_CODE_LINE_BASE || process.env.INIT_CWD || process.cwd();
-}
-
-function readPendingAiLineCount(baseDir, projectDir) {
-  const pendingPath = path.join(getCacheDir(baseDir), PENDING_COMMIT_FILE);
-  try {
-    const pending = JSON.parse(fs.readFileSync(pendingPath, "utf8"));
-    const project = pending.projects && pending.projects[path.resolve(projectDir)];
-    return Number.isInteger(project && project.aiLineCount) ? project.aiLineCount : 0;
-  } catch {
-    return 0;
+function runInstall(args) {
+  const installed = install(parseInstallOptions(args));
+  for (const targetDir of installed) {
+    console.log(`[x7-code-line] ${targetDir} configured successfully.`);
   }
+  return installed;
 }
 
-function writeCacheFile(baseDir, fileName, cache) {
-  const cacheDir = getCacheDir(baseDir);
-  fs.writeFileSync(path.join(cacheDir, fileName), `${JSON.stringify(cache, null, 2)}\n`);
-}
-
-function printHelp() {
-  const text = [
-    "Usage:",
-    "  x7-code-line install --dir <absolute-path> [--dir <absolute-path> ...] [--config path] [--relative]",
-    "  x7-code-line addDir --dir <absolute-path> [--dir <absolute-path> ...] [--config path] [--relative]",
-    "  x7-code-line prompt-submit",
-    "  x7-code-line stop",
-    "  x7-code-line git-pre-commit",
-    "  x7-code-line git-commit-msg <commit-msg-file>"
-  ].join("\n");
-  fs.writeSync(process.stdout.fd, `${text}\n`);
+function runAddDir(args) {
+  const added = addDirs(parseInstallOptions(args));
+  for (const targetDir of added) {
+    console.log(`[x7-code-line] ${targetDir} configured successfully.`);
+  }
+  return added;
 }
-
-module.exports = {
-  runCli
-};
+
+function readPendingAiLineCount(baseDir, projectDir) {
+  const pendingPath = path.join(getCacheDir(baseDir), PENDING_COMMIT_FILE);
+  try {
+    const pending = JSON.parse(fs.readFileSync(pendingPath, "utf8"));
+    const project = pending.projects && pending.projects[path.resolve(projectDir)];
+    return Number.isInteger(project && project.aiLineCount) ? project.aiLineCount : 0;
+  } catch {
+    return 0;
+  }
+}
+
+function writeCacheFile(baseDir, fileName, cache) {
+  const cacheDir = getCacheDir(baseDir);
+  fs.writeFileSync(path.join(cacheDir, fileName), `${JSON.stringify(cache, null, 2)}\n`);
+}
+
+function printHelp() {
+  const text = [
+    "Usage:",
+    "  x7-code-line install --dir <absolute-path> [--dir <absolute-path> ...] [--config path] [--relative]",
+    "  x7-code-line addDir --dir <absolute-path> [--dir <absolute-path> ...] [--config path] [--relative]",
+    "  x7-code-line prompt-submit",
+    "  x7-code-line stop",
+    "  x7-code-line git-pre-commit",
+    "  x7-code-line git-commit-msg <commit-msg-file>"
+  ].join("\n");
+  fs.writeSync(process.stdout.fd, `${text}\n`);
+}
+
+module.exports = {
+  runCli
+};

package/src/diff-lines.js

@@ -1,115 +1,115 @@
-"use strict";
-
-const crypto = require("node:crypto");
-const fs = require("node:fs");
-const path = require("node:path");
-const { execFileSync } = require("node:child_process");
-
-function getGitDiffLineIds(projectDir, options = {}) {
-  const args = ["diff", "--no-ext-diff", "--unified=0", "--no-color"];
-  if (options.staged) {
-    args.splice(1, 0, "--cached");
-  }
-
-  const diff = execFileSync("git", args, {
-    cwd: projectDir,
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-
-  return parseDiffLineIds(projectDir, diff, options);
-}
-
-function parseDiffLineIds(projectDir, diff, options = {}) {
-  const ids = [];
-  let currentFile = "";
-  let oldLine = 0;
-  let newLine = 0;
-  const fileMtimes = new Map();
-
-  for (const line of diff.split(/\r?\n/u)) {
-    if (line.startsWith("+++ b/")) {
-      currentFile = line.slice("+++ b/".length);
-      continue;
-    }
-    if (line.startsWith("+++ ")) {
-      currentFile = line.slice("+++ ".length);
-      continue;
-    }
-
-    const hunk = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/u.exec(line);
-    if (hunk) {
-      oldLine = Number(hunk[1]);
-      newLine = Number(hunk[2]);
-      continue;
-    }
-
-    if (!currentFile || line.startsWith("diff --git") || line.startsWith("index ")) {
-      continue;
-    }
-
-    if (line.startsWith("+") && !line.startsWith("+++")) {
-      ids.push(
-        makeLineId(projectDir, currentFile, "add", newLine, line.slice(1), getFileModifiedTime(projectDir, currentFile, fileMtimes))
-      );
-      newLine += 1;
-    } else if (line.startsWith("-") && !line.startsWith("---")) {
-      ids.push(
-        makeLineId(
-          projectDir,
-          currentFile,
-          "delete",
-          oldLine,
-          line.slice(1),
-          getFileModifiedTime(projectDir, currentFile, fileMtimes)
-        )
-      );
-      oldLine += 1;
-    } else if (line.startsWith(" ")) {
-      oldLine += 1;
-      newLine += 1;
-    }
-  }
-
-  return ids;
-}
-
-function makeLineId(projectDir, filePath, changeType, lineNumber, content, modifiedTimeMs = 0) {
-  return crypto
-    .createHash("sha256")
-    .update(
-      JSON.stringify({
-        project: path.resolve(projectDir),
-        file: filePath,
-        changeType,
-        lineNumber,
-        content,
-        modifiedTimeMs
-      })
-    )
-    .digest("hex");
-}
-
-function getFileModifiedTime(projectDir, filePath, fileMtimes) {
-  const key = `${path.resolve(projectDir)}\0${filePath}`;
-  if (fileMtimes.has(key)) {
-    return fileMtimes.get(key);
-  }
-
-  const absolutePath = path.resolve(projectDir, filePath);
-  let modifiedTimeMs = 0;
-  try {
-    modifiedTimeMs = fs.statSync(absolutePath).mtimeMs;
-  } catch {
-    modifiedTimeMs = 0;
-  }
-
-  fileMtimes.set(key, modifiedTimeMs);
-  return modifiedTimeMs;
-}
-
-module.exports = {
-  getGitDiffLineIds,
-  makeLineId,
-  parseDiffLineIds
-};
+"use strict";
+
+const crypto = require("node:crypto");
+const fs = require("node:fs");
+const path = require("node:path");
+const { execFileSync } = require("node:child_process");
+
+function getGitDiffLineIds(projectDir, options = {}) {
+  const args = ["diff", "--no-ext-diff", "--unified=0", "--no-color"];
+  if (options.staged) {
+    args.splice(1, 0, "--cached");
+  }
+
+  const diff = execFileSync("git", args, {
+    cwd: projectDir,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"]
+  });
+
+  return parseDiffLineIds(projectDir, diff, options);
+}
+
+function parseDiffLineIds(projectDir, diff, options = {}) {
+  const ids = [];
+  let currentFile = "";
+  let oldLine = 0;
+  let newLine = 0;
+  const fileMtimes = new Map();
+
+  for (const line of diff.split(/\r?\n/u)) {
+    if (line.startsWith("+++ b/")) {
+      currentFile = line.slice("+++ b/".length);
+      continue;
+    }
+    if (line.startsWith("+++ ")) {
+      currentFile = line.slice("+++ ".length);
+      continue;
+    }
+
+    const hunk = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/u.exec(line);
+    if (hunk) {
+      oldLine = Number(hunk[1]);
+      newLine = Number(hunk[2]);
+      continue;
+    }
+
+    if (!currentFile || line.startsWith("diff --git") || line.startsWith("index ")) {
+      continue;
+    }
+
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      ids.push(
+        makeLineId(projectDir, currentFile, "add", newLine, line.slice(1), getFileModifiedTime(projectDir, currentFile, fileMtimes))
+      );
+      newLine += 1;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      ids.push(
+        makeLineId(
+          projectDir,
+          currentFile,
+          "delete",
+          oldLine,
+          line.slice(1),
+          getFileModifiedTime(projectDir, currentFile, fileMtimes)
+        )
+      );
+      oldLine += 1;
+    } else if (line.startsWith(" ")) {
+      oldLine += 1;
+      newLine += 1;
+    }
+  }
+
+  return ids;
+}
+
+function makeLineId(projectDir, filePath, changeType, lineNumber, content, modifiedTimeMs = 0) {
+  return crypto
+    .createHash("sha256")
+    .update(
+      JSON.stringify({
+        project: path.resolve(projectDir),
+        file: filePath,
+        changeType,
+        lineNumber,
+        content,
+        modifiedTimeMs
+      })
+    )
+    .digest("hex");
+}
+
+function getFileModifiedTime(projectDir, filePath, fileMtimes) {
+  const key = `${path.resolve(projectDir)}\0${filePath}`;
+  if (fileMtimes.has(key)) {
+    return fileMtimes.get(key);
+  }
+
+  const absolutePath = path.resolve(projectDir, filePath);
+  let modifiedTimeMs = 0;
+  try {
+    modifiedTimeMs = fs.statSync(absolutePath).mtimeMs;
+  } catch {
+    modifiedTimeMs = 0;
+  }
+
+  fileMtimes.set(key, modifiedTimeMs);
+  return modifiedTimeMs;
+}
+
+module.exports = {
+  getGitDiffLineIds,
+  makeLineId,
+  parseDiffLineIds
+};

package/src/git-trailer.js

@@ -1,46 +1,46 @@
-"use strict";
-
-const fs = require("node:fs");
-const os = require("node:os");
-const { execFileSync } = require("node:child_process");
-
-const TRAILER_TOKEN = "x7-ai-lines";
-
-function appendCommitTrailer(commitMsgPath, aiLineCount = 0) {
-  const original = fs.readFileSync(commitMsgPath, "utf8");
-  const withTrailer = addTrailerWithGit(original, aiLineCount) || addTrailer(original, aiLineCount);
-  fs.writeFileSync(commitMsgPath, withTrailer);
-}
-
-function addTrailerWithGit(message, aiLineCount) {
-  try {
-    return execFileSync(
-      "git",
-      ["interpret-trailers", "--if-exists=replace", `--trailer=${TRAILER_TOKEN}=${aiLineCount}`],
-      {
-        input: message,
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "ignore"]
-      }
-    );
-  } catch {
-    return undefined;
-  }
-}
-
-function addTrailer(message, aiLineCount) {
-  const normalized = message.replace(/\s+$/u, "");
-  const trailerPattern = new RegExp(`^${TRAILER_TOKEN}:`, "imu");
-  const withoutExisting = normalized
-    .split(/\r?\n/u)
-    .filter((line) => !trailerPattern.test(line))
-    .join(os.EOL)
-    .replace(/\s+$/u, "");
-
-  return `${withoutExisting}${os.EOL}${os.EOL}${TRAILER_TOKEN}: ${aiLineCount}${os.EOL}`;
-}
-
-module.exports = {
-  TRAILER_TOKEN,
-  appendCommitTrailer
-};
+"use strict";
+
+const fs = require("node:fs");
+const os = require("node:os");
+const { execFileSync } = require("node:child_process");
+
+const TRAILER_TOKEN = "x7-ai-lines";
+
+function appendCommitTrailer(commitMsgPath, aiLineCount = 0) {
+  const original = fs.readFileSync(commitMsgPath, "utf8");
+  const withTrailer = addTrailerWithGit(original, aiLineCount) || addTrailer(original, aiLineCount);
+  fs.writeFileSync(commitMsgPath, withTrailer);
+}
+
+function addTrailerWithGit(message, aiLineCount) {
+  try {
+    return execFileSync(
+      "git",
+      ["interpret-trailers", "--if-exists=replace", `--trailer=${TRAILER_TOKEN}=${aiLineCount}`],
+      {
+        input: message,
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"]
+      }
+    );
+  } catch {
+    return undefined;
+  }
+}
+
+function addTrailer(message, aiLineCount) {
+  const normalized = message.replace(/\s+$/u, "");
+  const trailerPattern = new RegExp(`^${TRAILER_TOKEN}:`, "imu");
+  const withoutExisting = normalized
+    .split(/\r?\n/u)
+    .filter((line) => !trailerPattern.test(line))
+    .join(os.EOL)
+    .replace(/\s+$/u, "");
+
+  return `${withoutExisting}${os.EOL}${os.EOL}${TRAILER_TOKEN}: ${aiLineCount}${os.EOL}`;
+}
+
+module.exports = {
+  TRAILER_TOKEN,
+  appendCommitTrailer
+};

package/src/index.js

@@ -1,7 +1,7 @@
-"use strict";
-
-const { install } = require("./install");
-
-module.exports = {
-  install
-};
+"use strict";
+
+const { install } = require("./install");
+
+module.exports = {
+  install
+};