feat: [PRODUCT-585] implement sf nodes logs and sf nodes ssh (#208)

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

Author: sigmachirality

deno.lock

@@ -466,7 +466,7 @@ export async function addCreate(program: Command) {
     create.addOption(
       new Option(
         "-i, --image <image-id>",
-        "ID of the VM image to boot on the nodes. View available images with `sf vms images list`.",
+        "ID of the VM image to boot on the nodes. View available images with `sf node images list`.",
       ),
     );
   }

src/lib/nodes/create.ts

@@ -1,4 +1,5 @@
 import { Command } from "@commander-js/extra-typings";
+import { isFeatureEnabled } from "../../posthog.ts";
 import upload from "./upload.ts";
 import show from "./show.tsx";
 import list from "./list.tsx";
@@ -13,13 +14,13 @@ const image = new Command("images")
     `
 Examples:\n
   \x1b[2m# Upload an image file\x1b[0m
-  $ sf vm image upload ./my-image.img
+  $ sf node image upload ./my-image.img
 
   \x1b[2m# List all images\x1b[0m
-  $ sf vm image list
+  $ sf node image list
 
   \x1b[2m# Show image details and download URL\x1b[0m
-  $ sf vm image show <image-id>
+  $ sf node image show <image-id>
 `,
   )
   .addCommand(list)
@@ -29,4 +30,11 @@ Examples:\n
     image.help();
   });
 
+export async function addImage(program: Command) {
+  const imagesEnabled = await isFeatureEnabled("custom-vm-images");
+  if (imagesEnabled) {
+    program.addCommand(image);
+  }
+}
+
 export default image;

src/lib/vm/image/index.ts renamed to src/lib/nodes/image/index.ts

@@ -26,13 +26,13 @@ const list = new Command("list")
     `
 Next Steps:\n
   \x1b[2m# List all images\x1b[0m
-  $ sf vms images list
+  $ sf node images list
 
   \x1b[2m# Get detailed info for a specific image\x1b[0m
-  $ sf vms images show <image-id>
+  $ sf node images show <image-id>
 
   \x1b[2m# List images in JSON format\x1b[0m
-  $ sf vms images list --json
+  $ sf node images list --json
 `,
   )
   .action(async (options) => {
@@ -56,7 +56,7 @@ Next Steps:\n
       if (images.length === 0) {
         console.log("No images found.");
         console.log(gray("\nUpload your first image:"));
-        console.log("  sf vms images upload -f ./my-image.img -n my-image");
+        console.log("  sf node images upload -f ./my-image.img -n my-image");
         return;
       }
 
@@ -116,7 +116,7 @@ Next Steps:\n
             content: brightBlack(
               `${images.length - 5} older ${
                 images.length - 5 === 1 ? "image" : "images"
-              } not shown. Use sf vms images list --json to list all images.`,
+              } not shown. Use sf node images list --json to list all images.`,
             ),
           },
         ]);
@@ -130,7 +130,7 @@ Next Steps:\n
       // Always show how to get info for a specific image
       const firstImage = sortedImages[0];
       if (firstImage) {
-        console.log(`  sf vms images show ${cyan(firstImage.image_id)}`);
+        console.log(`  sf node images show ${cyan(firstImage.image_id)}`);
       }
       const firstCompletedImage = sortedImages.find(
         (image) => image.upload_status === "completed",

src/lib/vm/image/list.tsx renamed to src/lib/nodes/image/list.tsx

@@ -375,7 +375,7 @@ const upload = new Command("upload")
 
       const object = completeResponse.data;
       console.log(gray("\nNext steps:"));
-      console.log(`  sf vm images show ${cyan(object.image_id)}`);
+      console.log(`  sf nodes images show ${cyan(object.image_id)}`);
     } catch (err) {
       // Clean up spinner timer
       if (spinnerTimer) {

src/lib/vm/image/show.tsx renamed to src/lib/nodes/image/show.tsx

@@ -9,12 +9,11 @@ import set from "./set.ts";
 import extend from "./extend.ts";
 import get from "./get.tsx";
 import { addRedeploy } from "./redeploy.ts";
-import { isFeatureEnabled } from "../posthog.ts";
+import ssh from "./ssh.ts";
+import logs from "./logs.ts";
+import { addImage } from "./image/index.ts";
 
 export async function registerNodes(program: Command) {
-  const isEnabled = await isFeatureEnabled("vm-provider");
-  if (!isEnabled) return;
-
   const nodes = program
     .command("nodes")
     .alias("node")
@@ -25,7 +24,9 @@ export async function registerNodes(program: Command) {
     .addCommand(extend)
     .addCommand(release)
     .addCommand(deleteCommand)
-    .addCommand(set);
+    .addCommand(set)
+    .addCommand(ssh)
+    .addCommand(logs);
 
   const baseHelpText = nodes.helpInformation();
 
@@ -64,6 +65,21 @@ $ sf nodes set my-node-name --max-price 12.50
 
 \x1b[2m# Extend a reserved node\x1b[0m
 $ sf nodes extend my-node-name --duration 3600 --max-price 12.50
+
+\x1b[2m# SSH into a node's current VM\x1b[0m
+$ sf nodes ssh my-node-name
+
+\x1b[2m# View logs from a node's current VM\x1b[0m
+$ sf nodes logs my-node-name
+
+\x1b[2m# SSH into a specific VM\x1b[0m
+$ sf nodes ssh user@vm_xxxxxxxxxxxxxxxxxxxxx
+
+\x1b[2m# View logs from a specific VM\x1b[0m
+$ sf nodes logs -i vm_xxxxxxxxxxxxxxxxxxxxx
+
+\x1b[2m# Manage custom VM images\x1b[0m
+$ sf nodes images --help
   `,
     )
     // Add action to display help if no subcommand is provided
@@ -87,6 +103,7 @@ $ sf nodes --help
 `);
     });
 
+  await addImage(nodes);
   await addCreate(nodes);
   await addRedeploy(nodes);
 }

src/lib/vm/image/upload.ts renamed to src/lib/nodes/image/upload.ts

@@ -20,6 +20,7 @@ import { handleNodesError, nodesClient } from "../../nodesClient.ts";
 import { Row } from "../Row.tsx";
 import {
   createNodesTable,
+  getLastVM,
   getStatusColor,
   getVMStatusColor,
   jsonOption,
@@ -102,14 +103,12 @@ function getActionsForNode(node: SFCNodes.Node) {
   const nodeActions: { label: string; command: string }[] = [];
 
   // Get the last VM for logs/ssh commands
-  const lastVm = node.vms?.data?.sort((a, b) =>
-    (b.start_at ?? b.updated_at) - (a.start_at ?? a.updated_at)
-  ).at(0);
+  const lastVm = getLastVM(node);
 
   if (lastVm?.image_id) {
     nodeActions.push({
       label: "Image",
-      command: `sf vms image show ${brightBlack(lastVm.image_id)}`,
+      command: `sf nodes image show ${brightBlack(lastVm.image_id)}`,
     });
   }
 
@@ -119,12 +118,12 @@ function getActionsForNode(node: SFCNodes.Node) {
       if (lastVm?.id) {
         nodeActions.push({
           label: "SSH",
-          command: `sf vms ssh root@${brightBlack(String(lastVm.id))}`,
+          command: `sf nodes ssh root@${brightBlack(node.name)}`,
         });
         nodeActions.push(
           {
             label: "Logs",
-            command: `sf vms logs -i ${brightBlack(String(lastVm.id))}`,
+            command: `sf nodes logs ${brightBlack(node.name)}`,
           },
         );
       }
@@ -146,11 +145,11 @@ function getActionsForNode(node: SFCNodes.Node) {
         nodeActions.push(
           {
             label: "SSH",
-            command: `sf vms ssh root@${brightBlack(lastVm.id)}`,
+            command: `sf nodes ssh root@${brightBlack(node.name)}`,
           },
           {
             label: "Logs",
-            command: `sf vms logs -i ${brightBlack(lastVm.id)}`,
+            command: `sf nodes logs ${brightBlack(node.name)}`,
           },
         );
       }
@@ -205,7 +204,7 @@ function getActionsForNode(node: SFCNodes.Node) {
         nodeActions.push(
           {
             label: "Logs",
-            command: `sf vms logs -i ${brightBlack(lastVm.id)}`,
+            command: `sf nodes logs ${brightBlack(node.name)}`,
           },
         );
       }
@@ -245,11 +244,11 @@ function getActionsForNode(node: SFCNodes.Node) {
         nodeActions.push(
           {
             label: "SSH",
-            command: `sf vms ssh root@${brightBlack(lastVm.id)}`,
+            command: `sf nodes ssh root@${brightBlack(node.name)}`,
           },
           {
             label: "Logs",
-            command: `sf vms logs -i ${brightBlack(lastVm.id)}`,
+            command: `sf nodes logs ${brightBlack(node.name)}`,
           },
         );
       }
@@ -481,9 +480,8 @@ async function listNodesAction(options: ReturnType<typeof list.opts>) {
       );
 
       // Get actions from all nodes, deduplicated with newest nodes taking precedence
-      const nodesCommands: string[] = [];
-      const vmsCommands: string[] = [];
-      const seenNodesLabels = new Set<string>();
+      const allCommands: string[] = [];
+      const seenLabels = new Set<string>();
 
       // Sort nodes by created_at (newest first), fallback to index for consistent ordering
       const sortedNodes = [...nodes].sort((a, b) => {
@@ -493,38 +491,22 @@ async function listNodesAction(options: ReturnType<typeof list.opts>) {
       });
 
       // Collect actions from each node, with newer nodes taking precedence
-      // Limit to 3 nodes commands and 1 vms command
+      // Limit to 5 commands total, deduplicated by label
       for (const node of sortedNodes) {
         const nodeActions = getActionsForNode(node);
         for (const action of nodeActions) {
-          const isVmsCommand = action.command.includes("sf vms");
-
-          if (isVmsCommand) {
-            // Only add the first vms command we encounter (from newest node)
-            if (vmsCommands.length === 0) {
-              vmsCommands.push(action.command);
-            }
-          } else {
-            // For nodes commands, limit to 3 and deduplicate by label
-            if (
-              nodesCommands.length < 3 && !seenNodesLabels.has(action.label)
-            ) {
-              nodesCommands.push(action.command);
-              seenNodesLabels.add(action.label);
-            }
+          // Add command if we haven't seen this label and haven't reached the limit
+          if (allCommands.length < 5 && !seenLabels.has(action.label)) {
+            allCommands.push(action.command);
+            seenLabels.add(action.label);
           }
         }
       }
 
       // Print Next Steps section
-      if (nodesCommands.length > 0 || vmsCommands.length > 0) {
+      if (allCommands.length > 0) {
         console.log(gray("\nNext steps:"));
-        // Print nodes commands first
-        for (const command of nodesCommands) {
-          console.log(`  ${command}`);
-        }
-        // Then print vms commands
-        for (const command of vmsCommands) {
+        for (const command of allCommands) {
           console.log(`  ${command}`);
         }
       }