ghostdock 0.0.15 → 0.0.16

package/dist/cli-reference.md

@@ -1106,6 +1106,8 @@ ghostdock sandboxes files upload <sandbox-id> [path] [flags]
 | --- | --- |
 | `<sandbox-id>` | Sandbox name or id. Required. |
 | `--org <value>` | Organization id or slug, from `ghostdock organizations list` (default: GHOSTDOCK_ORG, then `ghostdock organizations use`). |
+| `--container <value>` | Container the files land in, by name, from `ghostdock sandboxes containers list`. Default: the sandbox's default container, else the one running container. |
+| `--start` | Start the container first when it is not running, without asking. |
 | `--zip <value>` | Local ZIP file to upload. |
 | `<path>` | File or directory to upload (additional paths are allowed). |
 

package/dist/cli.md

@@ -451,11 +451,16 @@ multiple files, or a large ZIP, use the dedicated multipart upload command inste
 ghostdock sandboxes files upload quiet-harbor ./dist
 ghostdock sandboxes files upload quiet-harbor ./index.html ./assets
 ghostdock sandboxes files upload quiet-harbor --zip ./site.zip
+ghostdock sandboxes files upload quiet-harbor ./dist --container web --start
 ```
 
 Each positional path may be a file or directory. Directory contents are uploaded recursively,
 preserving their relative paths; a file is uploaded by its basename. A `sandboxes files upload` call needs
 at least one path or `--zip`. Uploading to a stopped sandbox resumes it automatically.
+The files land in a container as the other `files` commands do (see
+[Containers in a sandbox](#containers-in-a-sandbox)): `--container <name>`, else the default,
+else the one running, and the CLI asks which one when it cannot tell. A stopped target container
+is started after a "Start it?" at the keyboard, or at once with `--start`.
 
 ### `ghostdock env`
 

package/dist/index.js

@@ -9176,7 +9176,7 @@ function getCliName(argv = process.argv) {
   return CLI_NAMES.find((name) => name === invoked) ?? "ghostdock";
 }
 // package.json
-var version = "0.0.15";
+var version = "0.0.16";
 var package_default = {
   name: "ghostdock",
   description: "Ghostdock CLI — device login and agent tool invocation from the command line",
@@ -9781,77 +9781,6 @@ var envCommand = defineCommand({
   }
 });
 
-// src/container-logs.ts
-var FOLLOW_INTERVAL_MS = 2000;
-function defaultLogsDeps(follow) {
-  let stop = false;
-  if (follow) {
-    process.once("SIGINT", () => {
-      stop = true;
-    });
-  }
-  return {
-    request: (input) => authorizedRequest("/api/v1/tools/sandboxes_containers_logs", {
-      method: "POST",
-      body: JSON.stringify(input)
-    }),
-    out: (line) => process.stdout.write(`${line}
-`),
-    err: (line) => process.stderr.write(`${line}
-`),
-    sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
-    stopped: () => stop
-  };
-}
-async function runContainerLogs(input, options, deps = defaultLogsDeps(options.follow)) {
-  const json = isJsonOutput();
-  const color = colorEnabled(process.stdout);
-  const print = (line) => {
-    if (json) {
-      deps.out(JSON.stringify(line));
-      return;
-    }
-    const text = options.timestamps && line.time ? `${dim(line.time, color)} ${line.text}` : line.text;
-    (line.stream === "stderr" ? deps.err : deps.out)(text);
-  };
-  let result = await deps.request(input);
-  if (!result.running) {
-    deps.err("The sandbox is stopped: it has no logs to show.");
-    return 1;
-  }
-  let last = null;
-  for (;; ) {
-    for (const line of result.lines) {
-      print(line);
-      if (line.time)
-        last = line.time;
-    }
-    if (!options.follow) {
-      if (result.truncated && json) {
-        deps.out(JSON.stringify({ truncated: true }));
-      } else if (result.truncated) {
-        deps.err(dim("(older lines left out: use --tail for more)", colorEnabled(process.stderr)));
-      }
-      return 0;
-    }
-    if (!result.truncated)
-      await deps.sleep(FOLLOW_INTERVAL_MS);
-    if (deps.stopped())
-      return 0;
-    const { tail: _tail, ...rest } = input;
-    try {
-      result = await deps.request(last ? { ...rest, after: last } : input);
-    } catch (error) {
-      deps.err(red(error instanceof Error ? error.message : String(error), colorEnabled(process.stderr)));
-      return 1;
-    }
-    if (!result.running) {
-      deps.err("The sandbox stopped.");
-      return 0;
-    }
-  }
-}
-
 // src/container-picker.ts
 import { createInterface } from "node:readline/promises";
 function notRunningContainerOf(error) {
@@ -9985,6 +9914,130 @@ async function withProgress(message, work, options) {
   }
 }
 
+// src/container-flow.ts
+async function withContainerPick(call, send, pickers, notice) {
+  try {
+    return await send();
+  } catch (err) {
+    const question = containerQuestionOf(err);
+    if (!pickers || !question || !call.canPick)
+      throw err;
+    const container = await pickers.choose(question);
+    if (!container)
+      throw err;
+    call.setContainer(container);
+    const result = await send();
+    if (call.sandboxId !== undefined && await pickers.confirmDefault(container)) {
+      try {
+        await authorizedRequest("/api/v1/tools/sandboxes_default_container", {
+          method: "POST",
+          body: JSON.stringify({
+            organization: call.organization,
+            sandboxId: call.sandboxId,
+            container
+          })
+        });
+        notice(eventLine("done", `Default container: ${container}.`));
+      } catch (err) {
+        notice(eventLine("failed", `The default container was not set: ${err instanceof Error ? err.message : String(err)}`));
+      }
+    }
+    return result;
+  }
+}
+async function withContainerStart(call, send, start, pickers, notice) {
+  try {
+    return await send();
+  } catch (err) {
+    const container = notRunningContainerOf(err);
+    if (!container || call.sandboxId === undefined)
+      throw err;
+    if (!start && !(pickers && await pickers.confirmStart(container)))
+      throw err;
+    await withProgress("Starting container…", () => authorizedRequest("/api/v1/tools/sandboxes_containers_start", {
+      method: "POST",
+      body: JSON.stringify({
+        organization: call.organization,
+        sandboxId: call.sandboxId,
+        container
+      })
+    }));
+    notice(eventLine("done", `Started ${container}.`));
+    return await send();
+  }
+}
+
+// src/container-logs.ts
+var FOLLOW_INTERVAL_MS = 2000;
+function defaultLogsDeps(follow) {
+  let stop = false;
+  if (follow) {
+    process.once("SIGINT", () => {
+      stop = true;
+    });
+  }
+  return {
+    request: (input) => authorizedRequest("/api/v1/tools/sandboxes_containers_logs", {
+      method: "POST",
+      body: JSON.stringify(input)
+    }),
+    out: (line) => process.stdout.write(`${line}
+`),
+    err: (line) => process.stderr.write(`${line}
+`),
+    sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+    stopped: () => stop
+  };
+}
+async function runContainerLogs(input, options, deps = defaultLogsDeps(options.follow)) {
+  const json = isJsonOutput();
+  const color = colorEnabled(process.stdout);
+  const print = (line) => {
+    if (json) {
+      deps.out(JSON.stringify(line));
+      return;
+    }
+    const text = options.timestamps && line.time ? `${dim(line.time, color)} ${line.text}` : line.text;
+    (line.stream === "stderr" ? deps.err : deps.out)(text);
+  };
+  let result = await deps.request(input);
+  if (!result.running) {
+    deps.err("The sandbox is stopped: it has no logs to show.");
+    return 1;
+  }
+  let last = null;
+  for (;; ) {
+    for (const line of result.lines) {
+      print(line);
+      if (line.time)
+        last = line.time;
+    }
+    if (!options.follow) {
+      if (result.truncated && json) {
+        deps.out(JSON.stringify({ truncated: true }));
+      } else if (result.truncated) {
+        deps.err(dim("(older lines left out: use --tail for more)", colorEnabled(process.stderr)));
+      }
+      return 0;
+    }
+    if (!result.truncated)
+      await deps.sleep(FOLLOW_INTERVAL_MS);
+    if (deps.stopped())
+      return 0;
+    const { tail: _tail, ...rest } = input;
+    try {
+      result = await deps.request(last ? { ...rest, after: last } : input);
+    } catch (error) {
+      deps.err(red(error instanceof Error ? error.message : String(error), colorEnabled(process.stderr)));
+      return 1;
+    }
+    if (!result.running) {
+      deps.err("The sandbox stopped.");
+      return 0;
+    }
+  }
+}
+
 // src/human.ts
 var ID_KEYS = [
   "sandboxId",
@@ -10288,10 +10341,10 @@ function buildToolInput(schema, rawArgs) {
 
 // src/commands/invoke.ts
 async function runToolInvoke(tool, rawArgs, log = console.log, error = printError, notice = printNotice, pickers = defaultContainerPickers()) {
+  const properties = tool.inputSchema.properties;
   let input;
   try {
     input = buildToolInput(tool.inputSchema, rawArgs);
-    const properties = tool.inputSchema.properties;
     if (properties && "organization" in properties && input.organization === undefined) {
       input.organization = await requireOrganizationRef(undefined, notice);
     }
@@ -10310,24 +10363,33 @@ async function runToolInvoke(tool, rawArgs, log = console.log, error = printErro
       return 1;
     }
   }
+  const call = {
+    organization: typeof input.organization === "string" ? input.organization : undefined,
+    sandboxId: typeof input.sandboxId === "string" ? input.sandboxId : undefined,
+    canPick: !!properties && "container" in properties && !input.container,
+    setContainer: (container) => {
+      input.container = container;
+    }
+  };
   try {
-    const send = () => authorizedRequest(`/api/v1/tools/${tool.name}`, {
+    const post = () => authorizedRequest(`/api/v1/tools/${tool.name}`, {
       method: "POST",
       body: JSON.stringify(input)
     });
-    const request = () => withContainerStart(input, send, rawArgs.start === true, pickers, notice);
     const waitMessage = PROGRESS_MESSAGES[tool.name];
-    if (!waitMessage) {
-      const result = await withContainerPick(tool, input, request, pickers, notice);
-      printResult(result, () => renderResult(result, colorEnabled(process.stdout)), log);
-      stopNote(result, notice);
-      return 0;
-    }
-    const { value: result, elapsed } = await withContainerPick(tool, input, () => withProgress(waitMessage, request), pickers, notice);
+    let elapsed;
+    const send = async () => {
+      if (!waitMessage)
+        return post();
+      const timed = await withProgress(waitMessage, post);
+      elapsed = timed.elapsed;
+      return timed.value;
+    };
+    const result = await withContainerPick(call, () => withContainerStart(call, send, rawArgs.start === true, pickers, notice), pickers, notice);
     printResult(result, () => {
       const color = colorEnabled(process.stdout);
       const lines = renderResult(result, color);
-      return bootLines(result, color).length > 0 ? lines : withElapsed(lines, elapsed);
+      return elapsed === undefined || bootLines(result, color).length > 0 ? lines : withElapsed(lines, elapsed);
     }, log);
     stopNote(result, notice);
     return 0;
@@ -10336,59 +10398,6 @@ async function runToolInvoke(tool, rawArgs, log = console.log, error = printErro
     return 1;
   }
 }
-async function withContainerPick(tool, input, send, pickers, notice) {
-  try {
-    return await send();
-  } catch (err) {
-    const properties = tool.inputSchema.properties;
-    const question = containerQuestionOf(err);
-    if (!pickers || !question || !properties || !("container" in properties) || input.container) {
-      throw err;
-    }
-    const container = await pickers.choose(question);
-    if (!container)
-      throw err;
-    input.container = container;
-    const result = await send();
-    if (typeof input.sandboxId === "string" && await pickers.confirmDefault(container)) {
-      try {
-        await authorizedRequest("/api/v1/tools/sandboxes_default_container", {
-          method: "POST",
-          body: JSON.stringify({
-            organization: input.organization,
-            sandboxId: input.sandboxId,
-            container
-          })
-        });
-        notice(eventLine("done", `Default container: ${container}.`));
-      } catch (err) {
-        notice(eventLine("failed", `The default container was not set: ${err instanceof Error ? err.message : String(err)}`));
-      }
-    }
-    return result;
-  }
-}
-async function withContainerStart(input, send, start, pickers, notice) {
-  try {
-    return await send();
-  } catch (err) {
-    const container = notRunningContainerOf(err);
-    if (!container || typeof input.sandboxId !== "string")
-      throw err;
-    if (!start && !(pickers && await pickers.confirmStart(container)))
-      throw err;
-    await authorizedRequest("/api/v1/tools/sandboxes_containers_start", {
-      method: "POST",
-      body: JSON.stringify({
-        organization: input.organization,
-        sandboxId: input.sandboxId,
-        container
-      })
-    });
-    notice(eventLine("done", `Started ${container}.`));
-    return await send();
-  }
-}
 function stopNote(result, notice) {
   if (!result || typeof result !== "object")
     return;
@@ -12745,7 +12754,7 @@ async function collectPath3(path) {
   await visit(path);
   return files;
 }
-async function runSandboxUpload(options, log = console.log, error = printError) {
+async function runSandboxUpload(options, log = console.log, error = printError, notice = printNotice, pickers = defaultContainerPickers()) {
   if (options.paths.length === 0 && !options.zip) {
     error("Provide at least one path or --zip.");
     return 1;
@@ -12761,9 +12770,26 @@ async function runSandboxUpload(options, log = console.log, error = printError)
     if (options.zip) {
       form.append("zip", new Blob([await readFile7(options.zip)]), basename5(options.zip));
     }
-    const { value: result } = await withProgress("Uploading…", () => authorizedRequest(`/api/v1/sandboxes/${encodeURIComponent(options.sandboxId)}/files?organization=${encodeURIComponent(organization)}`, { method: "POST", body: form }));
+    let container = options.container;
+    const call = {
+      organization,
+      sandboxId: options.sandboxId,
+      canPick: !container,
+      setContainer: (picked) => {
+        container = picked;
+      }
+    };
+    const send = async () => {
+      const query = new URLSearchParams({ organization });
+      if (container)
+        query.set("container", container);
+      const { value } = await withProgress("Uploading…", () => authorizedRequest(`/api/v1/sandboxes/${encodeURIComponent(options.sandboxId)}/files?${query}`, { method: "POST", body: form }));
+      return value;
+    };
+    const result = await withContainerPick(call, () => withContainerStart(call, send, options.start === true, pickers, notice), pickers, notice);
+    const count = `${result.written.length} file${result.written.length === 1 ? "" : "s"}`;
     printResult(result, () => [
-      eventLine("done", `Uploaded ${result.written.length} file${result.written.length === 1 ? "" : "s"} to ${options.sandboxId}.`)
+      eventLine("done", result.container ? `Uploaded ${count} to ${result.container} in ${options.sandboxId}.` : `Uploaded ${count} to ${options.sandboxId}.`)
     ], log);
     return 0;
   } catch (err) {
@@ -12787,6 +12813,14 @@ var sandboxUploadCommand = defineCommand({
       required: true
     },
     org: orgArg,
+    container: {
+      type: "string",
+      description: `Container the files land in, by name, from \`${getCliName()} sandboxes containers list\`. Default: the sandbox's default container, else the one running container.`
+    },
+    start: {
+      type: "boolean",
+      description: "Start the container first when it is not running, without asking."
+    },
     zip: {
       type: "string",
       description: "Local ZIP file to upload."
@@ -12802,7 +12836,9 @@ var sandboxUploadCommand = defineCommand({
       sandboxId: args["sandbox-id"],
       org: args.org,
       paths: args._.slice(1),
-      zip: args.zip
+      zip: args.zip,
+      container: args.container,
+      start: args.start
     });
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ghostdock",
   "description": "Ghostdock CLI — device login and agent tool invocation from the command line",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "type": "module",
   "bin": {
     "ghostdock": "dist/index.js",