@motionode/cli 0.2.0 → 0.2.1

package/bin/motionode.js

@@ -64,6 +64,13 @@ function flags(argv) {
 async function main() {
 	const [command, ...rest] = process.argv.slice(2);
 	const args = flags(rest);
+	/**
+	 * A server named for `connect` is the one this computer keeps using: the work
+	 * panel prints `motionode connect --api …` once, and every command after it
+	 * must stay on that Motionode rather than fall back to production
+	 * (QA-20261023T234000Z).
+	 */
+	if (command === 'connect' && typeof args.api === 'string') Config.useApi(args.api);
 	// --api (or MOTIONODE_API_URL) picks the Motionode — and its own saved connection.
 	const config = Config.load(typeof args.api === 'string' ? args.api : null);
 	switch (command) {

package/lib/bridge.js

@@ -9,6 +9,7 @@
  */
 
 const Git = require('./git');
+const { worktreePath } = require('./commands');
 const { client } = require('./api');
 const { version } = require('./api');
 
@@ -51,6 +52,18 @@ async function runJob(config, job) {
 	const ws = workspaceFor(config, payload.serviceUuid);
 	if (!ws) throw new Error(`No folder on this computer is linked to ${payload.serviceName || 'that repository'}. Run \`motionode link\` in it.`);
 	if (job.kind === 'checkout') {
+		/**
+		 * In --worktrees mode `motionode work` owns the ticket's branch in its own
+		 * folder, so checking it out in the linked folder conflicts with that
+		 * worktree (QA-20261023T235400Z). Create/reuse the same folder instead.
+		 */
+		if (ws.worktrees && payload.ticketDisplayId) {
+			const dir = worktreePath(ws, payload.ticketDisplayId);
+			const wt = await Git.worktreeFor(ws.path, payload.branch, dir);
+			log(`checked out ${payload.branch} in ${wt.path}`);
+			const st = await Git.status(wt.path);
+			return { branch: st.branch, headSha: st.headSha, path: wt.path };
+		}
 		const st = await Git.checkout(ws.path, payload.branch);
 		log(`checked out ${payload.branch} in ${ws.path}`);
 		return { branch: st.branch, headSha: st.headSha };

package/lib/commands.js

@@ -65,8 +65,26 @@ async function link(config, { serviceUuid = null, dir = process.cwd(), worktrees
 	if (!services.length) throw new Error('You have no projects with AI building enabled to work on locally.');
 	let pick = serviceUuid ? services.find((s) => s.uuid === serviceUuid) : null;
 	if (!pick) {
-		const remote = Git.normalizeRepoUrl(await Git.remoteUrl(root));
-		const matches = remote ? services.filter((s) => Git.normalizeRepoUrl(s.repoUrl) === remote) : [];
+		const remoteUrl = await Git.remoteUrl(root);
+		const remote = Git.normalizeRepoUrl(remoteUrl);
+		/**
+		 * A clone made with `motionode clone` has this Motionode's git proxy as its
+		 * remote, not GitHub's URL; recognize the repository behind it instead of
+		 * asking the person to choose what they just cloned
+		 * (QA-20261023T234000Z).
+		 */
+		const { proxiedRepoOf, ownerRepoOf } = require('./git_credential');
+		const proxied = proxiedRepoOf(config, remoteUrl);
+		const sameRepo = (repoUrl) => {
+			if (!proxied || !repoUrl) return false;
+			const ref = ownerRepoOf(repoUrl);
+			return !!ref
+				&& ref.owner.toLowerCase() === proxied.owner.toLowerCase()
+				&& ref.repo.toLowerCase() === proxied.repo.toLowerCase();
+		};
+		const matches = remote
+			? services.filter((s) => Git.normalizeRepoUrl(s.repoUrl) === remote || sameRepo(s.repoUrl))
+			: [];
 		if (matches.length === 1) pick = matches[0];
 		else {
 			const list = matches.length ? matches : services;
@@ -146,6 +164,21 @@ function worktreePath(ws, ticketRef) {
 	return path.join(path.dirname(ws.path), `${path.basename(ws.path)}.worktrees`, String(ticketRef).replace(/[^A-Za-z0-9._-]/g, '_'));
 }
 
+/**
+ * How to get a service whose repository has no linked folder here. A Motionode-hosted
+ * repository is private to Motionode, so its GitHub URL is not a clone the person can use:
+ * clone it through Motionode, against the server this command is already talking to.
+ */
+function cloneGuidance(b) {
+	if (b?.motionodeHosted) {
+		return b.repo
+			? `no linked folder here — clone it through Motionode: \`motionode clone ${b.repo}\`, then run \`motionode link\``
+			: 'no linked folder here — clone it through Motionode with `motionode clone <owner/repo>`, then run `motionode link`';
+	}
+	if (b?.cloneUrl) return `no linked folder here — \`git clone ${b.cloneUrl}\`, then run \`motionode link\``;
+	return 'no linked folder here — clone the repository, then run `motionode link`';
+}
+
 /** What `motionode finish` tells the person was recorded (the same facts the web confirmation shows). */
 function finishLines(res) {
 	const lines = [`✓ ${res.summary || 'Build finished.'}`];
@@ -166,7 +199,7 @@ async function work(config, ref) {
 	for (const b of lw.branches || []) {
 		const ws = (config.workspaces || []).find((w) => w.serviceUuid === b.serviceUuid);
 		if (!ws) {
-			console.log(`  ${b.serviceName}: ${b.branch}  (no linked folder here — clone ${b.cloneUrl || 'the repo'} and run \`motionode link\`)`);
+			console.log(`  ${b.serviceName}: ${b.branch}  (${cloneGuidance(b)})`);
 			continue;
 		}
 		try {
@@ -210,4 +243,4 @@ async function logout(config) {
 	console.log('✓ Disconnected this computer. (Remove it in Motionode Settings → Development workflow to revoke it there too.)');
 }
 
-module.exports = { login, link, connect, unlink, status, work, finish, logout, worktreePath, finishLines };
+module.exports = { login, link, connect, unlink, status, work, finish, logout, worktreePath, finishLines, cloneGuidance };

package/lib/git_credential.js

@@ -76,6 +76,24 @@ function ownerRepoOf(value) {
 	return m ? { owner: m[1], repo: m[2] } : null;
 }
 
+/**
+ * owner/repo behind a Motionode git-proxy URL on this Motionode
+ * (`<api>/git/<owner>/<repo>.git`), or null for any other remote. The clone
+ * `motionode clone` makes has this remote, and `motionode link` needs the
+ * repository it stands for (QA-20261023T234000Z).
+ */
+function proxiedRepoOf(config, remoteUrl) {
+	try {
+		const remote = new URL(String(remoteUrl || ''));
+		const api = new URL(String(config?.apiUrl || ''));
+		if (remote.host.toLowerCase() !== api.host.toLowerCase()) return null;
+		const m = remote.pathname.match(/^\/git\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
+		return m ? { owner: decodeURIComponent(m[1]), repo: decodeURIComponent(m[2]) } : null;
+	} catch (_e) {
+		return null;
+	}
+}
+
 /** The git config that makes this CLI the credential helper for one folder (never global). */
 function helperConfig(config) {
 	const bin = path.resolve(__dirname, '..', 'bin', 'motionode.js');
@@ -131,4 +149,4 @@ async function clone(config, target, dir = null) {
 	return null;
 }
 
-module.exports = { helper, clone, parseCredentialInput, isForThisMotionode, proxyUrl, ownerRepoOf, helperConfig };
+module.exports = { helper, clone, parseCredentialInput, isForThisMotionode, proxyUrl, ownerRepoOf, proxiedRepoOf, helperConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@motionode/cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Connect your local repositories to Motionode: work tickets in Cursor, VS Code or any editor while Motionode keeps the work tied to the ticket, its git branches, verification and delivery.",
   "license": "UNLICENSED",
   "bin": {