@united-robotics/cli 0.4.4 → 0.4.6

package/dist/index.js

@@ -2,23 +2,29 @@
 
 // src/index.ts
 import { Command } from "commander";
-import { chmodSync, 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, join } from "path";
+import { basename, dirname, join, parse } from "path";
 import { spawnSync } from "child_process";
-var configDir = join(homedir(), ".united-robotics");
-var configPath = join(configDir, "config.json");
+var configFileName = "config.json";
+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";
 function load() {
-  try {
-    return JSON.parse(readFileSync(configPath, "utf8"));
-  } catch {
-    return { apiUrl: defaultApiUrl };
+  const localPath = findLocalConfigPath(process.cwd());
+  for (const path of [process.env.UR_CONFIG, localPath, globalConfigPath].filter(Boolean)) {
+    try {
+      return JSON.parse(readFileSync(path, "utf8"));
+    } catch {
+    }
   }
+  return { apiUrl: defaultApiUrl };
 }
-function save(config) {
-  mkdirSync(configDir, { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
+function save(config, opts = {}) {
+  const path = opts.global ? globalConfigPath : localConfigPath(process.cwd());
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify(config, null, 2));
 }
 async function api(path, init = {}) {
   const cfg = load();
@@ -28,10 +34,10 @@ async function api(path, init = {}) {
 }
 var program = new Command();
 program.name("ur").description("United Robotics customer CLI").version("0.1.0");
-program.command("login").requiredOption("--token <token>").option("--api <url>").action((opts) => {
+program.command("login").requiredOption("--token <token>").option("--api <url>").option("--global", "write ~/.united-robotics/config.json instead of the current workspace").action((opts) => {
   const cfg = load();
-  save({ apiUrl: opts.api ?? cfg.apiUrl ?? defaultApiUrl, token: opts.token });
-  console.log("Logged in to United Robotics");
+  save({ apiUrl: opts.api ?? cfg.apiUrl ?? defaultApiUrl, token: opts.token }, { global: opts.global });
+  console.log(`Logged in to United Robotics (${opts.global ? "global" : "workspace"} config)`);
 });
 program.command("whoami").action(async () => console.log(JSON.stringify(await api("/api/me"), null, 2)));
 program.command("team").argument("<cmd>").action(async (cmd) => {
@@ -50,10 +56,19 @@ project.command("clone").argument("<projectId>").option("--dest <path>").option(
   try {
     if (opts.inPlace && opts.dest) throw new Error("Use either --in-place or --dest, not both.");
     const dest = opts.inPlace ? "." : opts.dest;
-    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 });
+    const preservedConfig = opts.inPlace ? preserveInPlaceWorkspaceConfig(process.cwd()) : null;
+    try {
+      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);
     configureGitIdentity(worktree, opts.name, opts.email, credentials.env);
     if (opts.submodules) initProjectWorktree(worktree, opts.name, opts.email, credentials.env);
@@ -174,11 +189,67 @@ ${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);
+}
+function findLocalConfigPath(start) {
+  let dir = start;
+  const root = parse(start).root;
+  while (true) {
+    const candidate = localConfigPath(dir);
+    if (existsSync(candidate)) return candidate;
+    if (dir === root) return null;
+    dir = dirname(dir);
+  }
+}
+function preserveInPlaceWorkspaceConfig(cwd) {
+  const configDir = join(cwd, configDirName);
+  const configPath = join(configDir, configFileName);
+  if (!existsSync(configPath)) return null;
+  const content = readFileSync(configPath, "utf8");
+  rmSync(configDir, { recursive: true, force: true });
+  return {
+    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.4",
+  "version": "0.4.6",
   "type": "module",
   "bin": {
     "ur": "dist/index.js"