@united-robotics/cli 0.4.5 → 0.4.6

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";
@@ -58,10 +58,14 @@ 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();
     }
@@ -185,11 +189,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 +232,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.6",
   "type": "module",
   "bin": {
     "ur": "dist/index.js"