x7-code-line 0.3.0 → 0.4.0

package/bin/x7-code-line.js

@@ -1,8 +1,8 @@
-#!/usr/bin/env node
-
-const { runCli } = require("../src/cli");
-
-runCli(process.argv.slice(2)).catch((error) => {
-  console.error(`[x7-code-line] ${error.message}`);
-  process.exit(1);
-});
+#!/usr/bin/env node
+
+const { runCli } = require("../src/cli");
+
+runCli(process.argv.slice(2)).catch((error) => {
+  console.error(`[x7-code-line] ${error.message}`);
+  process.exit(1);
+});

package/hooks/git/commit-msg

@@ -1,4 +1,4 @@
-#!/bin/sh
-set -eu
-
-npx --no-install x7-code-line git-commit-msg "$1"
+#!/bin/sh
+set -eu
+
+npx --no-install x7-code-line git-commit-msg "$1"

package/hooks/git/pre-commit

@@ -1,4 +1,4 @@
-#!/bin/sh
-set -eu
-
-npx --no-install x7-code-line git-pre-commit "$@"
+#!/bin/sh
+set -eu
+
+npx --no-install x7-code-line git-pre-commit "$@"

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "x7-code-line",
-  "version": "0.3.0",
-  "description": "Install Cursor, Codex, and git hooks for x7 code line workflows.",
-  "main": "src/index.js",
-  "bin": {
-    "x7-code-line": "bin/x7-code-line.js"
-  },
-  "scripts": {
-    "postinstall": "node src/postinstall.js",
-    "test": "node test/install.test.js"
-  },
-  "files": [
-    "bin/",
-    "hooks/",
-    "src/",
-    "templates/"
-  ],
-  "keywords": [
-    "cursor",
-    "codex",
-    "hooks",
-    "git-hooks"
-  ],
-  "author": "",
-  "license": "MIT",
-  "engines": {
-    "node": ">=18"
-  }
-}
+{
+  "name": "x7-code-line",
+  "version": "0.4.0",
+  "description": "Install Cursor, Codex, and git hooks for x7 code line workflows.",
+  "main": "src/index.js",
+  "bin": {
+    "x7-code-line": "bin/x7-code-line.js"
+  },
+  "scripts": {
+    "postinstall": "node src/postinstall.js",
+    "test": "node test/install.test.js"
+  },
+  "files": [
+    "bin/",
+    "hooks/",
+    "src/",
+    "templates/"
+  ],
+  "keywords": [
+    "cursor",
+    "codex",
+    "hooks",
+    "git-hooks"
+  ],
+  "author": "",
+  "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  }
+}

package/src/agent-hooks.js

@@ -1,62 +1,93 @@
-"use strict";
-
-const {
-  AI_DIFF_CACHE_FILE,
-  NORMAL_DIFF_CACHE_FILE,
-  addProjectId,
-  getProjectIds,
-  readLineIdCache,
-  readProjects,
-  writeLineIdCache
-} = require("./cache");
-const { getGitDiffLineIds } = require("./diff-lines");
-
+"use strict";
+
+const {
+  AI_DIFF_CACHE_FILE,
+  NORMAL_DIFF_CACHE_FILE,
+  addProjectId,
+  getProjectIds,
+  readLineIdCache,
+  readProjects,
+  writeLineIdCache
+} = require("./cache");
+const { getGitDiffLineIds } = require("./diff-lines");
+
 function handlePromptSubmit(baseDir = process.env.INIT_CWD || process.cwd()) {
+  log("prompt-submit", `start base=${baseDir}`);
   const projects = readProjects(baseDir);
   const aiCache = readLineIdCache(baseDir, AI_DIFF_CACHE_FILE);
   const normalCache = readLineIdCache(baseDir, NORMAL_DIFF_CACHE_FILE);
 
   for (const projectDir of projects) {
+    log("prompt-submit", `project ${projectDir}`);
     const aiIds = getProjectIds(aiCache, projectDir);
-    for (const id of safelyGetDiffLineIds(projectDir)) {
+    const ids = safelyGetDiffLineIds("prompt-submit", projectDir);
+    let addedCount = 0;
+    for (const id of ids) {
       if (!aiIds.has(id)) {
-        addProjectId(normalCache, projectDir, id);
+        if (addProjectId(normalCache, projectDir, id)) {
+          addedCount += 1;
+        }
       }
     }
+    log("prompt-submit", `project ${projectDir} cached=${addedCount}`);
   }
 
-  writeLineIdCache(baseDir, NORMAL_DIFF_CACHE_FILE, normalCache);
+  writeCache("prompt-submit", baseDir, NORMAL_DIFF_CACHE_FILE, normalCache);
+  log("prompt-submit", "end");
 }
 
 function handleStop(baseDir = process.env.INIT_CWD || process.cwd()) {
+  log("stop", `start base=${baseDir}`);
   const projects = readProjects(baseDir);
   const aiCache = readLineIdCache(baseDir, AI_DIFF_CACHE_FILE);
   const normalCache = readLineIdCache(baseDir, NORMAL_DIFF_CACHE_FILE);
 
   for (const projectDir of projects) {
+    log("stop", `project ${projectDir}`);
     const normalIds = getProjectIds(normalCache, projectDir);
-    for (const id of safelyGetDiffLineIds(projectDir)) {
+    const ids = safelyGetDiffLineIds("stop", projectDir);
+    let addedCount = 0;
+    for (const id of ids) {
       if (!normalIds.has(id)) {
-        addProjectId(aiCache, projectDir, id);
+        if (addProjectId(aiCache, projectDir, id)) {
+          addedCount += 1;
+        }
       }
     }
+    log("stop", `project ${projectDir} cached=${addedCount}`);
   }
 
-  writeLineIdCache(baseDir, AI_DIFF_CACHE_FILE, aiCache);
+  writeCache("stop", baseDir, AI_DIFF_CACHE_FILE, aiCache);
+  log("stop", "end");
 }
 
-function safelyGetDiffLineIds(projectDir) {
+function safelyGetDiffLineIds(command, projectDir) {
+  log(command, `reading diff ${projectDir}`);
   try {
-    return getGitDiffLineIds(projectDir);
+    const ids = getGitDiffLineIds(projectDir);
+    log(command, `read diff success ${projectDir} count=${ids.length}`);
+    return ids;
   } catch (error) {
-    if (process.env.X7_CODE_LINE_DEBUG === "1") {
-      console.error(`[x7-code-line] skip ${projectDir}: ${error.message}`);
-    }
+    log(command, `read diff failed ${projectDir}: ${error.message}`);
     return [];
   }
 }
 
-module.exports = {
-  handlePromptSubmit,
-  handleStop
-};
+function writeCache(command, baseDir, fileName, cache) {
+  try {
+    writeLineIdCache(baseDir, fileName, cache);
+    log(command, `write cache success ${fileName}`);
+  } catch (error) {
+    log(command, `write cache failed ${fileName}: ${error.message}`);
+    throw error;
+  }
+}
+
+function log(command, message) {
+  console.error(`[x7-code-line] ${command} ${message}`);
+}
+
+module.exports = {
+  handlePromptSubmit,
+  handleStop
+};

package/src/cache.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const fs = require("node:fs");
+const os = require("node:os");
 const path = require("node:path");
 
 const CACHE_DIR_NAME = ".x7-code-line";
@@ -8,98 +9,150 @@ const PROJECTS_CACHE_FILE = "projects.json";
 const AI_DIFF_CACHE_FILE = "ai-diff-line-ids.json";
 const NORMAL_DIFF_CACHE_FILE = "normal-diff-line-ids.json";
 const PENDING_COMMIT_FILE = "pending-commit.json";
-
+const BASE_POINTER_FILE = ".x7-code-line-base.json";
+
 function getCacheDir(baseDir = process.env.INIT_CWD || process.cwd()) {
   return path.join(path.resolve(baseDir), CACHE_DIR_NAME);
 }
 
-function ensureCacheFiles(baseDir) {
-  const cacheDir = getCacheDir(baseDir);
-  fs.mkdirSync(cacheDir, { recursive: true });
-  ensureJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects: [] });
-  ensureJson(path.join(cacheDir, AI_DIFF_CACHE_FILE), { projects: {} });
-  ensureJson(path.join(cacheDir, NORMAL_DIFF_CACHE_FILE), { projects: {} });
-  return cacheDir;
-}
-
-function writeProjects(baseDir, projectDirs) {
-  const cacheDir = ensureCacheFiles(baseDir);
-  const projects = [...new Set(projectDirs.map((dir) => path.resolve(dir)))];
-  writeJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects });
+function getInstallFile(baseDir = process.env.INIT_CWD || process.cwd()) {
+  return path.join(getCacheDir(baseDir), "install.json");
 }
 
-function readProjects(baseDir = process.env.INIT_CWD || process.cwd()) {
-  const cacheDir = ensureCacheFiles(baseDir);
-  const cache = readJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects: [] });
-  const projects = Array.isArray(cache.projects) ? cache.projects : [];
-  return projects.map((project) => path.resolve(project));
-}
-
-function readLineIdCache(baseDir, fileName) {
-  const cacheDir = ensureCacheFiles(baseDir);
-  const cache = readJson(path.join(cacheDir, fileName), { projects: {} });
-  return cache && typeof cache === "object" && !Array.isArray(cache) ? cache : { projects: {} };
+function getBasePointerPath() {
+  if (process.env.X7_CODE_LINE_POINTER_PATH) {
+    return path.resolve(process.env.X7_CODE_LINE_POINTER_PATH);
+  }
+  return path.join(os.homedir(), BASE_POINTER_FILE);
 }
-
-function writeLineIdCache(baseDir, fileName, cache) {
-  const cacheDir = ensureCacheFiles(baseDir);
-  writeJson(path.join(cacheDir, fileName), cache);
+
+function ensureCacheFiles(baseDir) {
+  const cacheDir = getCacheDir(baseDir);
+  fs.mkdirSync(cacheDir, { recursive: true });
+  ensureJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects: [] });
+  ensureJson(path.join(cacheDir, AI_DIFF_CACHE_FILE), { projects: {} });
+  ensureJson(path.join(cacheDir, NORMAL_DIFF_CACHE_FILE), { projects: {} });
+  return cacheDir;
+}
+
+function writeProjects(baseDir, projectDirs) {
+  const cacheDir = ensureCacheFiles(baseDir);
+  const projects = [...new Set(projectDirs.map((dir) => path.resolve(dir)))];
+  writeJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects });
+}
+
+function readProjects(baseDir = process.env.INIT_CWD || process.cwd()) {
+  const cacheDir = ensureCacheFiles(baseDir);
+  const cache = readJson(path.join(cacheDir, PROJECTS_CACHE_FILE), { projects: [] });
+  const projects = Array.isArray(cache.projects) ? cache.projects : [];
+  return projects.map((project) => path.resolve(project));
+}
+
+function readLineIdCache(baseDir, fileName) {
+  const cacheDir = ensureCacheFiles(baseDir);
+  const cache = readJson(path.join(cacheDir, fileName), { projects: {} });
+  return cache && typeof cache === "object" && !Array.isArray(cache) ? cache : { projects: {} };
+}
+
+function writeLineIdCache(baseDir, fileName, cache) {
+  const cacheDir = ensureCacheFiles(baseDir);
+  writeJson(path.join(cacheDir, fileName), cache);
+}
+
+function getProjectIds(cache, projectDir) {
+  const key = path.resolve(projectDir);
+  const ids = cache.projects && Array.isArray(cache.projects[key]) ? cache.projects[key] : [];
+  return new Set(ids);
+}
+
+function addProjectId(cache, projectDir, id) {
+  const key = path.resolve(projectDir);
+  if (!cache.projects || typeof cache.projects !== "object" || Array.isArray(cache.projects)) {
+    cache.projects = {};
+  }
+  if (!Array.isArray(cache.projects[key])) {
+    cache.projects[key] = [];
+  }
+  if (!cache.projects[key].includes(id)) {
+    cache.projects[key].push(id);
+    return true;
+  }
+  return false;
+}
+
+function clearProjectIds(cache, projectDir) {
+  const key = path.resolve(projectDir);
+  if (!cache.projects || typeof cache.projects !== "object" || Array.isArray(cache.projects)) {
+    cache.projects = {};
+    return false;
+  }
+  if (Object.prototype.hasOwnProperty.call(cache.projects, key)) {
+    delete cache.projects[key];
+    return true;
+  }
+  return false;
 }
 
-function getProjectIds(cache, projectDir) {
-  const key = path.resolve(projectDir);
-  const ids = cache.projects && Array.isArray(cache.projects[key]) ? cache.projects[key] : [];
-  return new Set(ids);
+function writeBasePointer(baseDir) {
+  const pointerPath = getBasePointerPath();
+  fs.mkdirSync(path.dirname(pointerPath), { recursive: true });
+  writeJson(pointerPath, { baseDir: path.resolve(baseDir) });
 }
 
-function addProjectId(cache, projectDir, id) {
-  const key = path.resolve(projectDir);
-  if (!cache.projects || typeof cache.projects !== "object" || Array.isArray(cache.projects)) {
-    cache.projects = {};
+function readBasePointer() {
+  const pointer = readJson(getBasePointerPath(), {});
+  if (!pointer || typeof pointer.baseDir !== "string" || !pointer.baseDir.trim()) {
+    return undefined;
   }
-  if (!Array.isArray(cache.projects[key])) {
-    cache.projects[key] = [];
-  }
-  if (!cache.projects[key].includes(id)) {
-    cache.projects[key].push(id);
-    return true;
-  }
-  return false;
-}
 
-function clearProjectIds(cache, projectDir) {
-  const key = path.resolve(projectDir);
-  if (!cache.projects || typeof cache.projects !== "object" || Array.isArray(cache.projects)) {
-    cache.projects = {};
-    return false;
-  }
-  if (Object.prototype.hasOwnProperty.call(cache.projects, key)) {
-    delete cache.projects[key];
-    return true;
-  }
-  return false;
+  const baseDir = path.resolve(pointer.baseDir);
+  return hasInstallFile(baseDir) ? baseDir : undefined;
 }
 
-function ensureJson(filePath, defaultValue) {
-  if (!fs.existsSync(filePath)) {
-    writeJson(filePath, defaultValue);
+function findInstalledBase(startDir) {
+  let current = path.resolve(startDir);
+
+  while (true) {
+    if (hasInstallFile(current)) {
+      return current;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return undefined;
+    }
+    current = parent;
   }
 }
 
-function readJson(filePath, defaultValue) {
+function hasInstallFile(baseDir) {
   try {
-    return JSON.parse(fs.readFileSync(filePath, "utf8"));
+    return fs.statSync(getInstallFile(baseDir)).isFile();
   } catch {
-    return defaultValue;
+    return false;
   }
 }
-
-function writeJson(filePath, value) {
-  fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`);
-}
-
-module.exports = {
+
+function ensureJson(filePath, defaultValue) {
+  if (!fs.existsSync(filePath)) {
+    writeJson(filePath, defaultValue);
+  }
+}
+
+function readJson(filePath, defaultValue) {
+  try {
+    return JSON.parse(fs.readFileSync(filePath, "utf8"));
+  } catch {
+    return defaultValue;
+  }
+}
+
+function writeJson(filePath, value) {
+  fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+module.exports = {
   AI_DIFF_CACHE_FILE,
+  BASE_POINTER_FILE,
   CACHE_DIR_NAME,
   NORMAL_DIFF_CACHE_FILE,
   PENDING_COMMIT_FILE,
@@ -107,10 +160,16 @@ module.exports = {
   addProjectId,
   clearProjectIds,
   ensureCacheFiles,
+  findInstalledBase,
+  getBasePointerPath,
   getCacheDir,
+  getInstallFile,
   getProjectIds,
+  hasInstallFile,
   readLineIdCache,
+  readBasePointer,
   readProjects,
+  writeBasePointer,
   writeLineIdCache,
   writeProjects
 };