refactor!: drop createImagesCommand options

Collapse the shared images factory back to a zero-arg function:

- always alias `os` and reference `sf images` in help/next-steps text
- always print the envelope shape for `list --json`
- delete the unused `sf nodes image` wrapper

BREAKING CHANGE: `sf nodes images list --json` and `sf vm images list --json`
now print the envelope object instead of a bare array. Scripts using
`... --json | jq '.[]'` need to switch to `... | jq '.data[]'`.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: sigmachirality

src/lib/images/get.tsx

@@ -12,7 +12,6 @@ import { logAndQuit } from "../../helpers/errors.ts";
 import { formatDate } from "../../helpers/format-time.ts";
 import type { components } from "../../schema.ts";
 import { Row } from "../Row.tsx";
-import type { CreateImagesOptions } from "./index.ts";
 
 dayjs.extend(utc);
 dayjs.extend(advanced);
@@ -97,7 +96,7 @@ function formatStatusInk(status: string): React.ReactElement {
   }
 }
 
-export function createGet(_opts: CreateImagesOptions = {}) {
+export function createGet() {
   return new Command("get")
     .alias("show")
     .description("Get image details and download URL")

src/lib/images/index.ts

@@ -3,46 +3,29 @@ import { createGet } from "./get.tsx";
 import { createList } from "./list.ts";
 import { createUpload } from "./upload.ts";
 
-export interface CreateImagesOptions {
-  /**
-   * Path users invoke this command under, used in help text and "next steps"
-   * suggestions (e.g. `"sf images"`, `"sf nodes images"`, `"sf vm images"`).
-   * Defaults to `"sf images"`.
-   */
-  parentPath?: string;
-  /**
-   * When true, `list --json` prints just the bare image array and `get --json`
-   * prints just the bare image object. Matches the pre-shared-factory output
-   * shape of `sf nodes images` / `sf vm images` so existing scripts piping
-   * `... --json | jq` keep working. Defaults to `false` (envelope shape).
-   */
-  legacyJsonShape?: boolean;
-}
-
-export function createImagesCommand(opts: CreateImagesOptions = {}) {
-  const { parentPath = "sf images", legacyJsonShape = false } = opts;
-  const subOpts = { parentPath, legacyJsonShape };
+export function createImagesCommand() {
   const images = new Command("images")
     .alias("image")
+    .alias("os")
     .description("Manage images")
     .showHelpAfterError()
     .addHelpText(
       "after",
       `
 Examples:\n
   \x1b[2m# Upload an image file\x1b[0m
-  $ ${parentPath} upload -f ./my-image.raw -n my-image
+  $ sf images upload -f ./my-image.raw -n my-image
 
   \x1b[2m# List all images\x1b[0m
-  $ ${parentPath} list
+  $ sf images list
 
   \x1b[2m# Get image details and download URL\x1b[0m
-  $ ${parentPath} get <image-id>
+  $ sf images get <image-id>
 `,
     )
-    .addCommand(createList(subOpts))
-    .addCommand(createUpload(subOpts))
-    .addCommand(createGet(subOpts))
+    .addCommand(createList())
+    .addCommand(createUpload())
+    .addCommand(createGet())
     .action(() => {
       images.help();
     });

src/lib/images/list.ts

@@ -6,11 +6,9 @@ import ora from "ora";
 import { apiClient } from "../../apiClient.ts";
 import { logAndQuit } from "../../helpers/errors.ts";
 import { formatDate } from "../../helpers/format-time.ts";
-import type { CreateImagesOptions } from "./index.ts";
 import { getDefaultWorkspace } from "./utils.ts";
 
-export function createList(opts: CreateImagesOptions = {}) {
-  const { parentPath = "sf images", legacyJsonShape = false } = opts;
+export function createList() {
   return new Command("list")
     .alias("ls")
     .description("List images")
@@ -21,13 +19,13 @@ export function createList(opts: CreateImagesOptions = {}) {
       `
 Examples:\n
   \x1b[2m# List all images\x1b[0m
-  $ ${parentPath} list
+  $ sf images list
 
   \x1b[2m# Get detailed info for a specific image\x1b[0m
-  $ ${parentPath} get <image-id>
+  $ sf images get <image-id>
 
   \x1b[2m# List images in JSON format\x1b[0m
-  $ ${parentPath} list --json
+  $ sf images list --json
 `,
     )
     .action(async (options) => {
@@ -47,13 +45,7 @@ Examples:\n
       }
 
       if (options.json) {
-        // legacyJsonShape: print just the bare array so existing scripts
-        // piping `... --json | jq '.[].id'` keep working under `sf nodes
-        // images list` / `sf vm images list`. Default (envelope) is the
-        // shape preferred for the new top-level `sf images list`.
-        console.log(
-          JSON.stringify(legacyJsonShape ? data.data : data, null, 2),
-        );
+        console.log(JSON.stringify(data, null, 2));
         return;
       }
 
@@ -62,7 +54,7 @@ Examples:\n
       if (images.length === 0) {
         console.log("No images found.");
         console.log(chalk.gray("\nUpload your first image:"));
-        console.log(`  ${parentPath} upload -f ./my-image.img -n my-image`);
+        console.log("  sf images upload -f ./my-image.img -n my-image");
         return;
       }
 
@@ -100,7 +92,7 @@ Examples:\n
             content: chalk.blackBright(
               `${images.length - 5} older ${
                 images.length - 5 === 1 ? "image" : "images"
-              } not shown. Use ${parentPath} list --json to list all images.`,
+              } not shown. Use sf images list --json to list all images.`,
             ),
           },
         ]);
@@ -111,7 +103,7 @@ Examples:\n
       console.log(chalk.gray("\nNext steps:"));
       const firstImage = sortedImages[0];
       if (firstImage) {
-        console.log(`  ${parentPath} get ${chalk.cyan(firstImage.id)}`);
+        console.log(`  sf images get ${chalk.cyan(firstImage.id)}`);
       }
       const firstCompletedImage = sortedImages.find(
         (image) => image.upload_status === "completed",

src/lib/images/upload.ts

@@ -12,7 +12,6 @@ import cliSpinners from "cli-spinners";
 import ora, { type Ora } from "ora";
 import { apiClient } from "../../apiClient.ts";
 import { logAndQuit } from "../../helpers/errors.ts";
-import type { CreateImagesOptions } from "./index.ts";
 import { getDefaultWorkspace } from "./utils.ts";
 
 async function readChunk(
@@ -54,7 +53,7 @@ async function readChunk(
   }
 }
 
-export function createUpload(_opts: CreateImagesOptions = {}) {
+export function createUpload() {
   return new Command("upload")
     .description("Upload an image file (multipart)")
     .requiredOption("-f, --file <file>", "Path to the image file")

src/lib/nodes/image/index.ts

@@ -5,7 +5,7 @@ import create from "./create.ts";
 import deleteCommand from "./delete.ts";
 import extend from "./extend.ts";
 import get from "./get.tsx";
-import createImagesCommand from "./image/index.ts";
+import { createImagesCommand } from "../images/index.ts";
 import list from "./list.tsx";
 import logs from "./logs.ts";
 import redeploy from "./redeploy.ts";

src/lib/nodes/index.ts

@@ -66,13 +66,5 @@ export async function registerVM(program: Command) {
     .addCommand(logs)
     .addCommand(replace)
     .addCommand(script)
-    .addCommand(
-      // Preserve the `os` alias and array-shaped `list --json` output that the
-      // pre-shared-factory `sf vm images` had; help text examples reference
-      // `sf vm images …` so they match the user's invocation.
-      createImagesCommand({
-        parentPath: "sf vm images",
-        legacyJsonShape: true,
-      }).alias("os"),
-    );
+    .addCommand(createImagesCommand());
 }