x7-code-line 0.2.0 → 0.4.0

package/src/install.js

@@ -1,268 +1,276 @@
-"use strict";
-
+"use strict";
+
 const fs = require("node:fs");
 const path = require("node:path");
-const { CACHE_DIR_NAME, ensureCacheFiles, readProjects, writeProjects } = require("./cache");
-
-const PACKAGE_ROOT = path.resolve(__dirname, "..");
-
-function install(options = {}) {
-  const pathBaseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
-  const config = readConfig(options.configPath || process.env.X7_CODE_LINE_CONFIG);
-  const targetDirs = normalizeTargetDirs(options.targetDirs, config, {
-    relativePaths: Boolean(options.relativePaths || process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"),
-    pathBaseDir
-  });
-  const cacheBaseDir = path.resolve(options.cacheBaseDir || pathBaseDir);
-  const validatedTargets = validateTargets(targetDirs, config);
-
-  installCurrentProjectFiles(cacheBaseDir);
-  for (const target of validatedTargets) {
-    installGitHooksInto(target, cacheBaseDir);
-  }
-  writeProjects(cacheBaseDir, validatedTargets.map((target) => target.targetDir));
-
-  return validatedTargets.map((target) => target.targetDir);
-}
-
-function installFromPostinstall() {
-  const envDirs = splitList(process.env.X7_CODE_LINE_DIRS);
-
-  return install({
-    configPath: process.env.X7_CODE_LINE_CONFIG,
-    targetDirs: envDirs,
-    relativePaths: process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"
-  });
-}
-
-function addDirs(options = {}) {
-  const explicitDirs = Array.isArray(options.targetDirs) ? options.targetDirs.map((dir) => String(dir || "").trim()).filter(Boolean) : [];
-  if (explicitDirs.length === 0) {
-    throw new Error("addDir requires at least one --dir value");
-  }
-
-  const pathBaseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
-  const config = readConfig(options.configPath || process.env.X7_CODE_LINE_CONFIG);
-  const targetDirs = normalizeTargetDirs(explicitDirs, config, {
-    relativePaths: Boolean(options.relativePaths || process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"),
-    pathBaseDir
-  });
-  const cacheBaseDir = path.resolve(options.cacheBaseDir || pathBaseDir);
-  assertInstalledBase(cacheBaseDir);
-
-  const validatedTargets = validateTargets(targetDirs, config);
-  for (const target of validatedTargets) {
-    installGitHooksInto(target, cacheBaseDir);
-  }
-
-  const mergedProjects = [...new Set([...readProjects(cacheBaseDir), ...validatedTargets.map((target) => target.targetDir)])];
-  writeProjects(cacheBaseDir, mergedProjects);
-
-  return validatedTargets.map((target) => target.targetDir);
-}
-
+const { CACHE_DIR_NAME, ensureCacheFiles, readProjects, writeBasePointer, writeProjects } = require("./cache");
+
+const PACKAGE_ROOT = path.resolve(__dirname, "..");
+
+function install(options = {}) {
+  const pathBaseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
+  const config = readConfig(options.configPath || process.env.X7_CODE_LINE_CONFIG);
+  const targetDirs = normalizeTargetDirs(options.targetDirs, config, {
+    relativePaths: Boolean(options.relativePaths || process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"),
+    pathBaseDir
+  });
+  const cacheBaseDir = path.resolve(options.cacheBaseDir || pathBaseDir);
+  const validatedTargets = validateTargets(targetDirs, config);
+
+  installCurrentProjectFiles(cacheBaseDir);
+  for (const target of validatedTargets) {
+    installGitHooksInto(target, cacheBaseDir);
+  }
+  writeProjects(cacheBaseDir, validatedTargets.map((target) => target.targetDir));
+
+  return validatedTargets.map((target) => target.targetDir);
+}
+
+function installFromPostinstall() {
+  const envDirs = splitList(process.env.X7_CODE_LINE_DIRS);
+  const configPath = process.env.X7_CODE_LINE_CONFIG;
+  const config = readConfig(configPath);
+  const configuredDirs = Array.isArray(config.dirs) ? config.dirs.map((dir) => String(dir || "").trim()).filter(Boolean) : [];
+
+  if (envDirs.length === 0 && configuredDirs.length === 0) {
+    return [];
+  }
+
+  return install({
+    configPath,
+    targetDirs: envDirs,
+    relativePaths: process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"
+  });
+}
+
+function addDirs(options = {}) {
+  const explicitDirs = Array.isArray(options.targetDirs) ? options.targetDirs.map((dir) => String(dir || "").trim()).filter(Boolean) : [];
+  if (explicitDirs.length === 0) {
+    throw new Error("addDir requires at least one --dir value");
+  }
+
+  const pathBaseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
+  const config = readConfig(options.configPath || process.env.X7_CODE_LINE_CONFIG);
+  const targetDirs = normalizeTargetDirs(explicitDirs, config, {
+    relativePaths: Boolean(options.relativePaths || process.env.X7_CODE_LINE_RELATIVE_PATHS === "1"),
+    pathBaseDir
+  });
+  const cacheBaseDir = path.resolve(options.cacheBaseDir || pathBaseDir);
+  assertInstalledBase(cacheBaseDir);
+
+  const validatedTargets = validateTargets(targetDirs, config);
+  for (const target of validatedTargets) {
+    installGitHooksInto(target, cacheBaseDir);
+  }
+
+  const mergedProjects = [...new Set([...readProjects(cacheBaseDir), ...validatedTargets.map((target) => target.targetDir)])];
+  writeProjects(cacheBaseDir, mergedProjects);
+
+  return validatedTargets.map((target) => target.targetDir);
+}
+
 function installCurrentProjectFiles(cacheBaseDir) {
-  const resolvedTarget = path.resolve(cacheBaseDir);
-  ensureDirectory(resolvedTarget);
-
-  const cacheDir = path.join(resolvedTarget, CACHE_DIR_NAME);
-  ensureCacheFiles(resolvedTarget);
-  writeJson(path.join(cacheDir, "install.json"), {
-    packageName: "x7-code-line",
-    installedAt: new Date().toISOString(),
-    moduleRoot: PACKAGE_ROOT
-  });
-
-  copyFile(
-    path.join(PACKAGE_ROOT, "templates", ".cursor", "hooks.json"),
-    path.join(resolvedTarget, ".cursor", "hooks.json")
-  );
+  const resolvedTarget = path.resolve(cacheBaseDir);
+  ensureDirectory(resolvedTarget);
+
+  const cacheDir = path.join(resolvedTarget, CACHE_DIR_NAME);
+  ensureCacheFiles(resolvedTarget);
+  writeJson(path.join(cacheDir, "install.json"), {
+    packageName: "x7-code-line",
+    installedAt: new Date().toISOString(),
+    moduleRoot: PACKAGE_ROOT
+  });
+
+  copyFile(
+    path.join(PACKAGE_ROOT, "templates", ".cursor", "hooks.json"),
+    path.join(resolvedTarget, ".cursor", "hooks.json")
+  );
   copyFile(
     path.join(PACKAGE_ROOT, "templates", ".codex", "hooks.json"),
     path.join(resolvedTarget, ".codex", "hooks.json")
   );
+  writeBasePointer(resolvedTarget);
 }
-
-function installGitHooksInto(target, cacheBaseDir = process.cwd()) {
-  for (const gitDir of target.gitDirs) {
-    installGitHooks(gitDir, cacheBaseDir);
-  }
-}
-
-function installGitHooks(gitDir, cacheBaseDir) {
-  const hooksDir = path.join(gitDir, "hooks");
-  ensureDirectory(hooksDir);
-
-  writeExecutable(path.join(hooksDir, "pre-commit"), makeGitHook("git-pre-commit", cacheBaseDir));
-  writeExecutable(path.join(hooksDir, "commit-msg"), makeGitHook("git-commit-msg \"$1\"", cacheBaseDir));
-}
-
-function resolveGitTargets(targetDir, config = {}) {
-  const configured = Array.isArray(config.gitDirs) ? config.gitDirs : [];
-  const gitDirs = configured.map((gitDir) => path.resolve(targetDir, gitDir));
-  const defaultGitDir = path.join(targetDir, ".git");
-
-  if (fs.existsSync(defaultGitDir)) {
-    gitDirs.unshift(defaultGitDir);
-  }
-
-  return [...new Set(gitDirs)].filter((gitDir) => {
-    try {
-      return fs.statSync(gitDir).isDirectory();
-    } catch {
-      return false;
-    }
-  });
-}
-
-function validateTargets(targetDirs, config = {}) {
-  return targetDirs.map((targetDir) => validateTarget(targetDir, config));
-}
-
-function validateTarget(targetDir, config = {}) {
-  const resolvedTarget = path.resolve(targetDir);
-  assertReachableDirectory(resolvedTarget);
-  const gitDirs = resolveGitTargets(resolvedTarget, config);
-
-  if (gitDirs.length === 0) {
-    throw new Error(`Target directory must contain a reachable .git directory: ${resolvedTarget}`);
-  }
-
-  const configured = Array.isArray(config.gitDirs) ? config.gitDirs : [];
-  if (configured.length > 0) {
-    const missing = configured
-      .map((gitDir) => path.resolve(resolvedTarget, gitDir))
-      .filter((gitDir) => !gitDirs.includes(gitDir));
-    if (missing.length > 0) {
-      throw new Error(`Configured gitDirs are not reachable in target directory: ${missing.join(", ")}`);
-    }
-  }
-
-  return { targetDir: resolvedTarget, gitDirs };
-}
-
-function assertReachableDirectory(directory) {
-  let stat;
-  try {
-    stat = fs.statSync(directory);
-  } catch {
-    throw new Error(`Target directory does not exist or is not reachable: ${directory}`);
-  }
-
-  if (!stat.isDirectory()) {
-    throw new Error(`Target path is not a directory: ${directory}`);
-  }
-
-  try {
-    fs.accessSync(directory, fs.constants.R_OK);
-  } catch {
-    throw new Error(`Target directory is not readable: ${directory}`);
-  }
-}
-
-function assertInstalledBase(cacheBaseDir) {
-  const installFile = path.join(cacheBaseDir, CACHE_DIR_NAME, "install.json");
-  try {
-    const stat = fs.statSync(installFile);
-    if (!stat.isFile()) {
-      throw new Error("");
-    }
-  } catch {
-    throw new Error(`Current directory is not an installed x7-code-line base: ${cacheBaseDir}`);
-  }
-}
-
-function readConfig(configPath) {
-  if (!configPath) {
-    return {};
-  }
-
-  const resolvedConfigPath = path.resolve(configPath);
-  const raw = fs.readFileSync(resolvedConfigPath, "utf8");
-  const config = JSON.parse(raw);
-
-  if (!config || typeof config !== "object" || Array.isArray(config)) {
-    throw new Error(`Config must be a JSON object: ${resolvedConfigPath}`);
-  }
-
-  return config;
-}
-
-function normalizeTargetDirs(targetDirs = [], config = {}, options = {}) {
-  const configuredDirs = Array.isArray(config.dirs) ? config.dirs : [];
-  const dirs = [...targetDirs, ...configuredDirs].map((dir) => String(dir || "").trim()).filter(Boolean);
-
-  if (dirs.length === 0) {
-    throw new Error("install requires at least one target directory");
-  }
-
-  const baseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
-  return [...new Set(dirs)].map((dir) => normalizeTargetDir(dir, options.relativePaths, baseDir));
-}
-
-function normalizeTargetDir(dir, relativePaths, baseDir) {
-  if (path.isAbsolute(dir)) {
-    return path.resolve(dir);
-  }
-  if (!relativePaths) {
-    throw new Error(`Target directory must be an absolute path unless --relative is used: ${dir}`);
-  }
-  return path.resolve(baseDir, dir);
-}
-
-function splitList(value) {
-  return String(value || "")
-    .split(path.delimiter)
-    .map((entry) => entry.trim())
-    .filter(Boolean);
-}
-
-function copyFile(source, destination) {
-  ensureDirectory(path.dirname(destination));
-  fs.copyFileSync(source, destination);
-  try {
-    fs.chmodSync(destination, 0o755);
-  } catch {
-    // Windows and some package managers may ignore chmod.
-  }
-}
-
-function writeExecutable(destination, content) {
-  ensureDirectory(path.dirname(destination));
-  fs.writeFileSync(destination, content);
-  try {
-    fs.chmodSync(destination, 0o755);
-  } catch {
-    // Windows and some package managers may ignore chmod.
-  }
-}
-
-function makeGitHook(command, cacheBaseDir) {
-  return [
-    "#!/bin/sh",
-    "set -eu",
-    `X7_CODE_LINE_BASE=${shellQuote(path.resolve(cacheBaseDir))}`,
-    "export X7_CODE_LINE_BASE",
-    `npx --no-install x7-code-line ${command}`,
-    ""
-  ].join("\n");
-}
-
-function shellQuote(value) {
-  return `'${String(value).replace(/'/g, "'\\''")}'`;
-}
-
-function writeJson(destination, value) {
-  fs.writeFileSync(destination, `${JSON.stringify(value, null, 2)}\n`);
-}
-
-function ensureDirectory(directory) {
-  fs.mkdirSync(directory, { recursive: true });
-}
-
-module.exports = {
-  addDirs,
-  CACHE_DIR_NAME,
-  install,
-  installFromPostinstall
-};
+
+function installGitHooksInto(target, cacheBaseDir = process.cwd()) {
+  for (const gitDir of target.gitDirs) {
+    installGitHooks(gitDir, cacheBaseDir);
+  }
+}
+
+function installGitHooks(gitDir, cacheBaseDir) {
+  const hooksDir = path.join(gitDir, "hooks");
+  ensureDirectory(hooksDir);
+
+  writeExecutable(path.join(hooksDir, "pre-commit"), makeGitHook("git-pre-commit", cacheBaseDir));
+  writeExecutable(path.join(hooksDir, "commit-msg"), makeGitHook("git-commit-msg \"$1\"", cacheBaseDir));
+}
+
+function resolveGitTargets(targetDir, config = {}) {
+  const configured = Array.isArray(config.gitDirs) ? config.gitDirs : [];
+  const gitDirs = configured.map((gitDir) => path.resolve(targetDir, gitDir));
+  const defaultGitDir = path.join(targetDir, ".git");
+
+  if (fs.existsSync(defaultGitDir)) {
+    gitDirs.unshift(defaultGitDir);
+  }
+
+  return [...new Set(gitDirs)].filter((gitDir) => {
+    try {
+      return fs.statSync(gitDir).isDirectory();
+    } catch {
+      return false;
+    }
+  });
+}
+
+function validateTargets(targetDirs, config = {}) {
+  return targetDirs.map((targetDir) => validateTarget(targetDir, config));
+}
+
+function validateTarget(targetDir, config = {}) {
+  const resolvedTarget = path.resolve(targetDir);
+  assertReachableDirectory(resolvedTarget);
+  const gitDirs = resolveGitTargets(resolvedTarget, config);
+
+  if (gitDirs.length === 0) {
+    throw new Error(`Target directory must contain a reachable .git directory: ${resolvedTarget}`);
+  }
+
+  const configured = Array.isArray(config.gitDirs) ? config.gitDirs : [];
+  if (configured.length > 0) {
+    const missing = configured
+      .map((gitDir) => path.resolve(resolvedTarget, gitDir))
+      .filter((gitDir) => !gitDirs.includes(gitDir));
+    if (missing.length > 0) {
+      throw new Error(`Configured gitDirs are not reachable in target directory: ${missing.join(", ")}`);
+    }
+  }
+
+  return { targetDir: resolvedTarget, gitDirs };
+}
+
+function assertReachableDirectory(directory) {
+  let stat;
+  try {
+    stat = fs.statSync(directory);
+  } catch {
+    throw new Error(`Target directory does not exist or is not reachable: ${directory}`);
+  }
+
+  if (!stat.isDirectory()) {
+    throw new Error(`Target path is not a directory: ${directory}`);
+  }
+
+  try {
+    fs.accessSync(directory, fs.constants.R_OK);
+  } catch {
+    throw new Error(`Target directory is not readable: ${directory}`);
+  }
+}
+
+function assertInstalledBase(cacheBaseDir) {
+  const installFile = path.join(cacheBaseDir, CACHE_DIR_NAME, "install.json");
+  try {
+    const stat = fs.statSync(installFile);
+    if (!stat.isFile()) {
+      throw new Error("");
+    }
+  } catch {
+    throw new Error(`Current directory is not an installed x7-code-line base: ${cacheBaseDir}`);
+  }
+}
+
+function readConfig(configPath) {
+  if (!configPath) {
+    return {};
+  }
+
+  const resolvedConfigPath = path.resolve(configPath);
+  const raw = fs.readFileSync(resolvedConfigPath, "utf8");
+  const config = JSON.parse(raw);
+
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error(`Config must be a JSON object: ${resolvedConfigPath}`);
+  }
+
+  return config;
+}
+
+function normalizeTargetDirs(targetDirs = [], config = {}, options = {}) {
+  const configuredDirs = Array.isArray(config.dirs) ? config.dirs : [];
+  const dirs = [...targetDirs, ...configuredDirs].map((dir) => String(dir || "").trim()).filter(Boolean);
+
+  if (dirs.length === 0) {
+    throw new Error("install requires at least one target directory");
+  }
+
+  const baseDir = path.resolve(options.pathBaseDir || process.env.INIT_CWD || process.cwd());
+  return [...new Set(dirs)].map((dir) => normalizeTargetDir(dir, options.relativePaths, baseDir));
+}
+
+function normalizeTargetDir(dir, relativePaths, baseDir) {
+  if (path.isAbsolute(dir)) {
+    return path.resolve(dir);
+  }
+  if (!relativePaths) {
+    throw new Error(`Target directory must be an absolute path unless --relative is used: ${dir}`);
+  }
+  return path.resolve(baseDir, dir);
+}
+
+function splitList(value) {
+  return String(value || "")
+    .split(path.delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+}
+
+function copyFile(source, destination) {
+  ensureDirectory(path.dirname(destination));
+  fs.copyFileSync(source, destination);
+  try {
+    fs.chmodSync(destination, 0o755);
+  } catch {
+    // Windows and some package managers may ignore chmod.
+  }
+}
+
+function writeExecutable(destination, content) {
+  ensureDirectory(path.dirname(destination));
+  fs.writeFileSync(destination, content);
+  try {
+    fs.chmodSync(destination, 0o755);
+  } catch {
+    // Windows and some package managers may ignore chmod.
+  }
+}
+
+function makeGitHook(command, cacheBaseDir) {
+  return [
+    "#!/bin/sh",
+    "set -eu",
+    `X7_CODE_LINE_BASE=${shellQuote(path.resolve(cacheBaseDir))}`,
+    "export X7_CODE_LINE_BASE",
+    `npx --no-install x7-code-line ${command}`,
+    ""
+  ].join("\n");
+}
+
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, "'\\''")}'`;
+}
+
+function writeJson(destination, value) {
+  fs.writeFileSync(destination, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+function ensureDirectory(directory) {
+  fs.mkdirSync(directory, { recursive: true });
+}
+
+module.exports = {
+  addDirs,
+  CACHE_DIR_NAME,
+  install,
+  installFromPostinstall
+};

package/src/postinstall.js

@@ -1,13 +1,13 @@
-"use strict";
-
-const { installFromPostinstall } = require("./install");
-
-try {
-  const installed = installFromPostinstall();
-  if (process.env.X7_CODE_LINE_DEBUG === "1") {
-    console.error(`[x7-code-line] installed into ${installed.join(", ")}`);
-  }
-} catch (error) {
-  console.error(`[x7-code-line] postinstall failed: ${error.message}`);
-  process.exit(1);
-}
+"use strict";
+
+const { installFromPostinstall } = require("./install");
+
+try {
+  const installed = installFromPostinstall();
+  if (process.env.X7_CODE_LINE_DEBUG === "1") {
+    console.error(`[x7-code-line] installed into ${installed.join(", ")}`);
+  }
+} catch (error) {
+  console.error(`[x7-code-line] postinstall failed: ${error.message}`);
+  process.exit(1);
+}

package/templates/.codex/hooks.json

@@ -1,14 +1,30 @@
-{
-  "hooks": {
-    "UserPromptSubmit": [
-      {
-        "command": "npx --no-install x7-code-line prompt-submit"
-      }
-    ],
-    "Stop": [
-      {
-        "command": "npx --no-install x7-code-line stop"
-      }
-    ]
-  }
-}
+{
+  "hooks": {
+    "UserPromptSubmit": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx --no-install x7-code-line prompt-submit",
+            "timeout": 30,
+            "statusMessage": "Logging UserPromptSubmit hook"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx --no-install x7-code-line stop",
+            "timeout": 30,
+            "statusMessage": "Logging Stop hook"
+          }
+        ]
+      }
+    ]
+  }
+}

package/templates/.cursor/hooks.json

@@ -1,14 +1,17 @@
-{
-  "hooks": {
-    "beforeSubmitPrompt": [
-      {
-        "command": "npx --no-install x7-code-line prompt-submit"
-      }
-    ],
-    "stop": [
-      {
-        "command": "npx --no-install x7-code-line stop"
-      }
-    ]
-  }
-}
+{
+  "version": 1,
+  "hooks": {
+    "beforeSubmitPrompt": [
+      {
+        "comment": "记录代码id",
+        "command": "npx --no-install x7-code-line prompt-submit"
+      }
+    ],
+    "stop": [
+      {
+        "comment": "记录AI代码标识",
+        "command": "npx --no-install x7-code-line stop"
+      }
+    ]
+  }
+}