@united-robotics/cli 0.4.5 → 0.4.7

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { Command } from "commander";
-import { chmodSync, existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { chmodSync, existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync, appendFileSync } from "fs";
 import { homedir, tmpdir } from "os";
 import { basename, dirname, join, parse } from "path";
 import { spawnSync } from "child_process";
@@ -26,6 +26,17 @@ function save(config, opts = {}) {
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, JSON.stringify(config, null, 2));
 }
+function rememberDefaultProject(projectId, cwd) {
+  const currentCwd = process.cwd();
+  try {
+    process.chdir(cwd);
+    const cfg = load();
+    save({ ...cfg, defaultProjectId: projectId });
+    ignoreWorkspaceConfigInGit(cwd);
+  } finally {
+    process.chdir(currentCwd);
+  }
+}
 async function api(path, init = {}) {
   const cfg = load();
   const res = await fetch(`${cfg.apiUrl}${path}`, { ...init, headers: { authorization: `Bearer ${cfg.token ?? ""}`, "content-type": "application/json", ...init.headers ?? {} } });
@@ -58,16 +69,22 @@ project.command("clone").argument("<projectId>").option("--dest <path>").option(
     const dest = opts.inPlace ? "." : opts.dest;
     const preservedConfig = opts.inPlace ? preserveInPlaceWorkspaceConfig(process.cwd()) : null;
     try {
-      if (opts.inPlace) assertInPlaceCloneTarget(process.cwd());
-      const cloneArgs = ["clone", primary.url];
-      if (dest) cloneArgs.push(dest);
-      runGit(cloneArgs, { cwd: process.cwd(), env: credentials.env, authHint: true });
+      if (opts.inPlace && isEmptyGitWorktree(process.cwd())) {
+        checkoutPrimaryIntoExistingGitWorktree(primary, opts.name, opts.email, credentials.env);
+      } else {
+        if (opts.inPlace) assertInPlaceCloneTarget(process.cwd());
+        const cloneArgs = ["clone", primary.url];
+        if (dest) cloneArgs.push(dest);
+        runGit(cloneArgs, { cwd: process.cwd(), env: credentials.env, authHint: true });
+      }
     } finally {
       preservedConfig?.restore();
     }
     const worktree = dest ?? repoDirName(primary.url);
+    rememberDefaultProject(projectId, worktree);
     configureGitIdentity(worktree, opts.name, opts.email, credentials.env);
-    if (opts.submodules) initProjectWorktree(worktree, opts.name, opts.email, credentials.env);
+    if (opts.submodules) initProjectWorktree(worktree, projectId, opts.name, opts.email, credentials.env);
+    else configureGitCredentialHelper(worktree, projectId, credentials.env);
     printCloneSuccess(projectId, worktree, token);
   } finally {
     credentials.cleanup();
@@ -77,7 +94,8 @@ project.command("init").argument("<projectId>").option("--cwd <path>", "workspac
   const token = await projectGithubToken(projectId);
   const credentials = createGitAskpass(token.token);
   try {
-    initProjectWorktree(opts.cwd, opts.name, opts.email, credentials.env);
+    rememberDefaultProject(projectId, opts.cwd);
+    initProjectWorktree(opts.cwd, projectId, opts.name, opts.email, credentials.env);
     console.log(`Initialized ${projectId} workspace at ${opts.cwd}`);
     printDetachedHeadNotice();
   } finally {
@@ -99,6 +117,16 @@ git.command("identity").option("--name <name>", "Git user.name", "exis[ai]").opt
   }
   console.log(`Configured git committer identity: ${opts.name} <${opts.email}>`);
 });
+git.command("credential-helper").description("Git credential helper used by United Robotics workspaces").argument("[operation]", "git credential helper operation").option("--project <projectId>", "project id; defaults to local config defaultProjectId").action(async (operation, opts) => {
+  if (operation && operation !== "get") return;
+  const projectId = opts.project ?? load().defaultProjectId;
+  if (!projectId) throw new Error("Missing project id for UR git credential helper. Run `ur project init <projectId>` from the workspace root.");
+  const result = await projectGithubToken(projectId);
+  process.stdout.write(`username=x-access-token
+password=${result.token}
+
+`);
+});
 var github = program.command("github");
 github.command("token").option("--project <projectId>", "project id", "skinspirit-main").option("--repo <repo>", "repo id, name, full name, or URL within the project").option("--json", "emit full JSON").option("--redact", "redact token in JSON output").action(async (opts) => {
   const result = await api(`/api/projects/${opts.project}/github-token`, {
@@ -154,21 +182,36 @@ esac
     cleanup: () => rmSync(dir, { recursive: true, force: true })
   };
 }
-function initProjectWorktree(worktree, name, email, env = process.env) {
+function initProjectWorktree(worktree, projectId, name, email, env = process.env) {
   configureGitIdentity(worktree, name, email, env);
   runGit(["submodule", "sync", "--recursive"], { cwd: worktree, env, authHint: true, allowFailure: true });
   runGit(["submodule", "update", "--init", "--recursive"], { cwd: worktree, env, authHint: true });
+  configureGitCredentialHelper(worktree, projectId, env);
   configureSubmoduleIdentities(worktree, name, email, env);
+  configureSubmoduleCredentialHelpers(worktree, projectId, env);
   printDetachedHeadNotice();
 }
 function configureGitIdentity(cwd, name, email, env = process.env) {
   runGit(["config", "--local", "user.name", name], { cwd, env });
   runGit(["config", "--local", "user.email", email], { cwd, env });
 }
+function configureGitCredentialHelper(cwd, projectId, env = process.env) {
+  const helper = `!ur git credential-helper --project ${shellSingleQuoteSafe(projectId)}`;
+  runGit(["config", "--local", "--unset-all", "credential.helper"], { cwd, env, allowFailure: true });
+  runGit(["config", "--local", "--add", "credential.helper", ""], { cwd, env });
+  runGit(["config", "--local", "--add", "credential.helper", helper], { cwd, env });
+  runGit(["config", "--local", "credential.useHttpPath", "true"], { cwd, env });
+  runGit(["config", "--local", "credential.interactive", "false"], { cwd, env, allowFailure: true });
+}
 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.");
 }
+function configureSubmoduleCredentialHelpers(worktree, projectId, env = process.env) {
+  const helper = `!ur git credential-helper --project ${shellSingleQuoteSafe(projectId)}`;
+  const result = runGit(["submodule", "foreach", "--recursive", `git config --local --unset-all credential.helper || true; git config --local --add credential.helper ''; git config --local --add credential.helper '${shellSingleQuoteSafe(helper)}'; git config --local credential.useHttpPath true; git config --local credential.interactive false || true`], { cwd: worktree, env, allowFailure: true });
+  if (result.status !== 0) console.warn("Warning: could not apply UR git credential helper to all submodules. Run `ur project init <projectId>` after submodules are initialized.");
+}
 function runGit(args, options = { cwd: process.cwd() }) {
   const gitArgs = options.authHint ? ["-c", "credential.helper=", "-c", "credential.useHttpPath=true", ...args] : args;
   const result = spawnSync(gitBin(), gitArgs, { cwd: options.cwd, env: options.env ?? process.env, encoding: "utf8" });
@@ -185,11 +228,26 @@ ${result.stderr}`)) {
   return { status, stdout: result.stdout ?? "", stderr: result.stderr ?? "" };
 }
 function assertInPlaceCloneTarget(cwd) {
-  const entries = readdirSync(cwd).filter((entry) => ![".DS_Store"].includes(entry));
+  const entries = inPlaceRelevantEntries(cwd);
   if (entries.length > 0) {
-    throw new Error(`Cannot in-place clone into a non-empty directory (${cwd}). Start from an empty Codex project root, or use --dest <path> intentionally.`);
+    throw new Error(`Cannot in-place clone into a non-empty directory (${cwd}). Start from an empty Codex project root, use an empty Git repo root, or use --dest <path> intentionally.`);
   }
 }
+function isEmptyGitWorktree(cwd) {
+  const entries = inPlaceRelevantEntries(cwd);
+  return entries.length === 1 && entries[0] === ".git";
+}
+function inPlaceRelevantEntries(cwd) {
+  return readdirSync(cwd).filter((entry) => ![".DS_Store", configDirName].includes(entry));
+}
+function checkoutPrimaryIntoExistingGitWorktree(repo, name, email, env) {
+  const branch = repo.defaultBranch || "main";
+  configureGitIdentity(process.cwd(), name, email, env);
+  if (gitRemoteExists(process.cwd(), "origin")) runGit(["remote", "set-url", "origin", repo.url], { cwd: process.cwd(), env });
+  else runGit(["remote", "add", "origin", repo.url], { cwd: process.cwd(), env });
+  runGit(["fetch", "origin", branch], { cwd: process.cwd(), env, authHint: true });
+  runGit(["checkout", "-B", branch, `origin/${branch}`], { cwd: process.cwd(), env });
+}
 function localConfigPath(cwd) {
   return join(cwd, configDirName, configFileName);
 }
@@ -213,9 +271,24 @@ function preserveInPlaceWorkspaceConfig(cwd) {
     restore: () => {
       mkdirSync(configDir, { recursive: true });
       writeFileSync(configPath, content);
+      ignoreWorkspaceConfigInGit(cwd);
     }
   };
 }
+function gitRemoteExists(cwd, remote) {
+  const result = spawnSync(gitBin(), ["remote", "get-url", remote], { cwd, encoding: "utf8", stdio: "ignore" });
+  return result.status === 0;
+}
+function ignoreWorkspaceConfigInGit(cwd) {
+  const gitDir = join(cwd, ".git");
+  if (!existsSync(gitDir)) return;
+  const excludePath = join(gitDir, "info", "exclude");
+  mkdirSync(dirname(excludePath), { recursive: true });
+  const existing = existsSync(excludePath) ? readFileSync(excludePath, "utf8") : "";
+  if (!existing.split(/\r?\n/).includes(`${configDirName}/`)) appendFileSync(excludePath, `
+${configDirName}/
+`);
+}
 function gitBin() {
   return process.env.UR_GIT_BIN || (process.platform === "darwin" ? "/usr/bin/git" : "git");
 }

package/package.json

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