thinkncollab-cli 0.0.64 → 0.0.66

package/bin/index.js

@@ -314,7 +314,7 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, previousVer
 }
 
 /** ------------------ PUSH FUNCTION ------------------ **/
-async function push(roomId, targetPath) {
+async function push(roomId, targetPath, pushBranch) {
   const { token, email } = readToken();
   const tncMetaPath = path.join(process.cwd(), ".tnc", ".tncmeta.json");
   if (!fs.existsSync(tncMetaPath)) {
@@ -370,7 +370,7 @@ async function push(roomId, targetPath) {
     console.log("🗂️ Sending metadata...");
      const res = await axios.post(
       `${BASE_URL}/${roomId}/upload`,
-      { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId },
+      { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId , pushBranch},
       { headers: { authorization: `Bearer ${token}`, email } }
     );
 
@@ -435,14 +435,15 @@ async function main() {
       break;
 
     case "push": {
-      const roomIndex = args.indexOf("--room");
-      if (roomIndex === -1 || !args[roomIndex + 1] || !args[roomIndex + 2]) {
+      const roomIndex = args.indexOf("push");
+      if (roomIndex === -1 || !args[roomIndex + 2] || !args[roomIndex + 2]) {
         console.error("Usage: tnc push --room <roomId> <file-or-folder-path>");
         process.exit(1);
       }
-      const roomId = args[roomIndex + 1];
-      const targetPath = args[roomIndex + 2];
-      await push(roomId, targetPath);
+      const roomId = args[roomIndex + 2];
+      const branch = args[roomIndex+1];
+      const targetPath = args[roomIndex + 3];
+      await push(roomId, targetPath, branch);
       break;
     }
     case "status":

package/commands/branch.js

@@ -4,8 +4,8 @@ import axios from "axios";
 import os from "os";
 import inquirer from "inquirer";
 
-// Updates the current branch name in .tnc/.tncmeta.json
-async function updateBranch(branchName) {
+
+async function updateBranch(branchName, branchId) {
   const currentDir = process.cwd();
   const tncFolder = path.join(currentDir, ".tnc");
   const tncmetaFile = path.join(tncFolder, ".tncmeta.json");
@@ -30,6 +30,7 @@ async function updateBranch(branchName) {
 
   // Update the current branch
   meta.currentBranch = branchName;
+  Object.assign(meta, {branchId: `${branchId}`});
 
   // Write updated data
   fs.writeFileSync(tncmetaFile, JSON.stringify(meta, null, 2), "utf-8");
@@ -80,7 +81,7 @@ async function createBranch(roomId) {
 
     if (res.data.success) {
       console.log(`✅ Branch '${branchName}' created successfully!`);
-      await updateBranch(branchName);
+      await updateBranch(branchName, res.branch.id);
     } else {
       console.log(`❌ Failed to create branch: ${res.data.message}`);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkncollab-cli",
   "author": "Raman Singh",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "CLI tool for ThinkNCollab",
   "main": "index.js",
   "bin": {