@united-robotics/cli 0.4.7 → 0.4.8

package/dist/index.js

@@ -11,6 +11,8 @@ var configDirName = ".united-robotics";
 var globalConfigDir = join(homedir(), configDirName);
 var globalConfigPath = join(globalConfigDir, configFileName);
 var defaultApiUrl = process.env.UR_API_URL ?? "https://united-robotics.rollersoft.com.au";
+var defaultGitName = "exis[ai]";
+var defaultGitEmail = "gotexis@gmail.com";
 function load() {
   const localPath = findLocalConfigPath(process.cwd());
   for (const path of [process.env.UR_CONFIG, localPath, globalConfigPath].filter(Boolean)) {
@@ -58,7 +60,7 @@ program.command("team").argument("<cmd>").action(async (cmd) => {
 var project = program.command("project");
 project.command("ls").option("--team <teamId>").action(async (opts) => console.log(JSON.stringify(await api(`/api/projects${opts.team ? `?team=${encodeURIComponent(opts.team)}` : ""}`), null, 2)));
 project.command("show").argument("<projectId>").action(async (projectId) => console.log(JSON.stringify({ projectId, repos: await projectRepos(projectId) }, null, 2)));
-project.command("clone").argument("<projectId>").option("--dest <path>").option("--in-place", "clone into the current directory so AGENTS.md and workspace files land at the project root").option("--no-submodules", "clone primary repo only").option("--name <name>", "Git user.name for Vercel-compatible commits", "exis[ai]").option("--email <email>", "Git user.email for Vercel-compatible commits", "gotexis@gmail.com").action(async (projectId, opts) => {
+project.command("clone").argument("<projectId>").option("--dest <path>").option("--in-place", "clone into the current directory so AGENTS.md and workspace files land at the project root").option("--no-submodules", "clone primary repo only").option("--name <name>", "Git user.name for Vercel-compatible commits", defaultGitName).option("--email <email>", "Git user.email for Vercel-compatible commits", defaultGitEmail).action(async (projectId, opts) => {
   const repos = await projectRepos(projectId);
   const primary = repos.find((r) => r.kind === "primary") ?? repos[0];
   if (!primary) throw new Error("No repo found");
@@ -90,7 +92,7 @@ project.command("clone").argument("<projectId>").option("--dest <path>").option(
     credentials.cleanup();
   }
 });
-project.command("init").argument("<projectId>").option("--cwd <path>", "workspace path", process.cwd()).option("--name <name>", "Git user.name for Vercel-compatible commits", "exis[ai]").option("--email <email>", "Git user.email for Vercel-compatible commits", "gotexis@gmail.com").action(async (projectId, opts) => {
+project.command("init").argument("<projectId>").option("--cwd <path>", "workspace path", process.cwd()).option("--name <name>", "Git user.name for Vercel-compatible commits", defaultGitName).option("--email <email>", "Git user.email for Vercel-compatible commits", defaultGitEmail).action(async (projectId, opts) => {
   const token = await projectGithubToken(projectId);
   const credentials = createGitAskpass(token.token);
   try {
@@ -107,7 +109,7 @@ program.command("repo").argument("<cmd>").argument("<projectId>").action(async (
   console.log(JSON.stringify(await projectRepos(projectId), null, 2));
 });
 var git = program.command("git").description("Git helpers for tenant workspaces");
-git.command("identity").option("--name <name>", "Git user.name", "exis[ai]").option("--email <email>", "Git user.email", "gotexis@gmail.com").option("--global", "write global git config instead of current repo").option("--recursive", "also apply to initialized submodules").action((opts) => {
+git.command("identity").option("--name <name>", "Git user.name", defaultGitName).option("--email <email>", "Git user.email", defaultGitEmail).option("--global", "write global git config instead of current repo").option("--recursive", "also apply to initialized submodules").action((opts) => {
   if (opts.global) {
     runGit(["config", "--global", "user.name", opts.name], { cwd: process.cwd() });
     runGit(["config", "--global", "user.email", opts.email], { cwd: process.cwd() });
@@ -194,6 +196,67 @@ function initProjectWorktree(worktree, projectId, name, email, env = process.env
 function configureGitIdentity(cwd, name, email, env = process.env) {
   runGit(["config", "--local", "user.name", name], { cwd, env });
   runGit(["config", "--local", "user.email", email], { cwd, env });
+  installIdentityHooks(cwd, name, email);
+}
+function installIdentityHooks(cwd, name, email) {
+  const gitDir = resolveGitDir(cwd);
+  if (!gitDir) return;
+  const hooksDir = join(gitDir, "hooks");
+  mkdirSync(hooksDir, { recursive: true });
+  const expected = `${name} <${email}>`;
+  const preCommit = `#!/bin/sh
+set -eu
+expected_name='${shellSingleQuoteSafe(name)}'
+expected_email='${shellSingleQuoteSafe(email)}'
+actual_name="\${GIT_AUTHOR_NAME:-$(git config --get user.name || true)}"
+actual_email="\${GIT_AUTHOR_EMAIL:-$(git config --get user.email || true)}"
+committer_name="\${GIT_COMMITTER_NAME:-$(git config --get user.name || true)}"
+committer_email="\${GIT_COMMITTER_EMAIL:-$(git config --get user.email || true)}"
+if [ "$actual_name" != "$expected_name" ] || [ "$actual_email" != "$expected_email" ] || [ "$committer_name" != "$expected_name" ] || [ "$committer_email" != "$expected_email" ]; then
+  echo "United Robotics identity guard: commits must use ${expected}." >&2
+  echo "Run: ur git identity --recursive" >&2
+  exit 1
+fi
+`;
+  const prePush = `#!/bin/sh
+set -eu
+expected='${shellSingleQuoteSafe(expected)}'
+while read local_ref local_sha remote_ref remote_sha; do
+  case "$local_sha" in
+    0000000000000000000000000000000000000000) continue ;;
+  esac
+  if [ "$remote_sha" = "0000000000000000000000000000000000000000" ]; then
+    range="$local_sha"
+  else
+    range="$remote_sha..$local_sha"
+  fi
+  bad=$(git log --format='%H%x09%an <%ae>%x09%cn <%ce>' "$range" -- 2>/dev/null | awk -F '	' -v e="$expected" '$2 != e || $3 != e { print; exit }')
+  if [ -n "$bad" ]; then
+    echo "United Robotics identity guard: refusing push with non-standard author/committer." >&2
+    echo "$bad" >&2
+    echo "Expected author and committer: $expected" >&2
+    echo "Fix by recommitting/amending after: ur git identity --recursive" >&2
+    exit 1
+  fi
+done
+`;
+  writeExecutableHook(join(hooksDir, "pre-commit"), preCommit);
+  writeExecutableHook(join(hooksDir, "pre-push"), prePush);
+}
+function resolveGitDir(cwd) {
+  const result = runGit(["rev-parse", "--git-dir"], { cwd, allowFailure: true });
+  if (result.status !== 0) return null;
+  const value = result.stdout.trim();
+  if (!value) return null;
+  return value.startsWith("/") ? value : join(cwd, value);
+}
+function writeExecutableHook(path, content) {
+  writeFileSync(path, content, { mode: 493 });
+  chmodSync(path, 493);
+}
+function listInitializedSubmodules(worktree, env = process.env) {
+  const result = runGit(["submodule", "status", "--recursive"], { cwd: worktree, env, allowFailure: true });
+  return result.stdout.split(/\r?\n/).map((line) => line.trim().split(/\s+/)[1]).filter((value) => Boolean(value));
 }
 function configureGitCredentialHelper(cwd, projectId, env = process.env) {
   const helper = `!ur git credential-helper --project ${shellSingleQuoteSafe(projectId)}`;
@@ -206,6 +269,7 @@ function configureGitCredentialHelper(cwd, projectId, env = process.env) {
 function configureSubmoduleIdentities(worktree, name, email, env = process.env) {
   const result = runGit(["submodule", "foreach", "--recursive", `git config --local user.name '${shellSingleQuoteSafe(name)}' && git config --local user.email '${shellSingleQuoteSafe(email)}'`], { cwd: worktree, env, allowFailure: true });
   if (result.status !== 0) console.warn("Warning: could not apply git identity to all submodules. Run `ur git identity --recursive` after submodules are initialized.");
+  for (const submodule of listInitializedSubmodules(worktree, env)) installIdentityHooks(join(worktree, submodule), name, email);
 }
 function configureSubmoduleCredentialHelpers(worktree, projectId, env = process.env) {
   const helper = `!ur git credential-helper --project ${shellSingleQuoteSafe(projectId)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@united-robotics/cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "type": "module",
   "bin": {
     "ur": "dist/index.js"