@groundfloorcloud/cli 0.1.6 → 0.1.8

package/README.md

@@ -72,7 +72,7 @@ Authentication, mode `groundfloor` or `external`) until the realm is active.
 |-------------------|-------------|---------------|
 | `function` | Function | HTTP on `0.0.0.0:PORT`/8080. Node needs `scripts.start`. |
 | `job` | Background job | Run-to-completion. Then `gf coderunner run`. |
-| `schedule` | Scheduled job | Cron. No public URL. |
+| `schedule` | Scheduled job | Cron via `--schedule` or `groundfloor.json` `schedule`. No public URL. |
 | `service` | **Deployment** | Long-running HTTP. **Root `Dockerfile` is required.** |
 
 ```bash
@@ -81,6 +81,7 @@ gf deploy --git https://github.com/me/my-fn.git --ref main
 gf deploy --name my-fn --runtime python --cpu 250m --memory 256Mi \
   -e API_KEY=secret
 gf deploy --workload-type service
+gf deploy --workload-type schedule --schedule "*/5 * * * *"
 gf deploy --app-id <app-uuid>
 ```
 
@@ -118,7 +119,8 @@ Then `gf deploy` the same tree. Do not zip `.env` files.
   "workloadType": "function",
   "cpu": "250m",
   "memory": "256Mi",
-  "env": { "STAGE": "dev" }
+  "env": { "STAGE": "dev" },
+  "schedule": "*/5 * * * *"
 }
 ```
 
@@ -132,6 +134,7 @@ Then `gf deploy` the same tree. Do not zip `.env` files.
 | `--subdir <dir>` | Package a subdirectory of the source. |
 | `--runtime <r>` | `python` \| `node` \| `dotnet-script`. |
 | `--workload-type <t>` | `function` \| `service` (Deployment) \| `job` \| `schedule`. Service requires a Dockerfile. |
+| `--schedule <cron>` | Cron for `schedule` workloads (or `groundfloor.json` `schedule`). |
 | `--cpu` / `--memory` | Resource requests, e.g. `250m` / `256Mi`. |
 | `-e, --env KEY=VALUE` | Deployment env var (repeatable). |
 | `-m, --message <text>` | Version description. |
@@ -205,10 +208,12 @@ gf apps get <id|slug>
 | `gf whoami` | Show identity and verify the Control Plane session. |
 | `gf token` | Print a fresh access token. |
 | `gf env` | Print `export …` lines for `eval "$(gf env)"`. |
+| `gf environments ls` (`envs`) | List workspace environments. |
 | `gf workspaces` (`ws`) | List workspaces; `gf workspaces use <id>` sets the default. |
 | `gf coderunner ls` (`cr ls`) | List coderunners. |
 | `gf coderunner status -c <id\|slug>` | Status and current deployment. |
 | `gf coderunner logs -c <id\|slug>` | Process Log (stdout/stderr). Also printed automatically on `gf deploy` failure. |
+| `gf coderunner cancel-deployment -c <id\|slug>` | Delete the current (or `--deployment-id`) deployment. |
 | `gf coderunner run -c <id\|slug> [--payload '{}']` | Invoke a deployed function or job. |
 | `gf deploy` | Package code and deploy as a coderunner. |
 | `gf domains ls\|add\|rm\|verify -c <id\|slug>` | Custom domains for a service. |

package/dist/index.js

@@ -709,6 +709,22 @@ async function getDeployment(apiUrl, workspaceId, coderunnerId) {
   }
   return await res.json();
 }
+function deleteCoderunnerDeployment(apiUrl, workspaceId, coderunnerId, deploymentId) {
+  return cpDelete(
+    apiUrl,
+    `/v1/workspaces/${encodeURIComponent(
+      workspaceId
+    )}/coderunners/${encodeURIComponent(
+      coderunnerId
+    )}/deployments/${encodeURIComponent(deploymentId)}`
+  );
+}
+function listWorkspaceEnvironments(apiUrl, workspaceId) {
+  return cpGet(
+    apiUrl,
+    `/v1/workspaces/${encodeURIComponent(workspaceId)}/environments`
+  );
+}
 function getCoderunnerStatus(apiUrl, workspaceId, coderunnerId) {
   return cpGet(
     apiUrl,
@@ -1017,6 +1033,79 @@ async function coderunnerListCommand(opts) {
   }
 }
 
+// src/resolve-coderunner.ts
+async function resolveCoderunnerId(apiUrl, workspaceId, idOrSlug) {
+  const list = await listCoderunners(apiUrl, workspaceId);
+  const match = list.find((c) => c.id === idOrSlug || c.slug === idOrSlug);
+  if (!match) {
+    throw new Error(`Coderunner not found: ${idOrSlug}`);
+  }
+  return match.id;
+}
+
+// src/commands/cancel-deployment.ts
+async function cancelDeploymentCommand(opts) {
+  const cfg = await resolveConfig({ workspaceId: opts.workspace });
+  if (!cfg.workspaceId) {
+    throw new Error(
+      "No workspace selected. Run `gf workspaces use <id>` or pass --workspace <id>."
+    );
+  }
+  const coderunnerId = await resolveCoderunnerId(
+    cfg.apiUrl,
+    cfg.workspaceId,
+    opts.coderunner
+  );
+  let deploymentId = opts.deploymentId?.trim();
+  if (!deploymentId) {
+    const current = await getDeployment(cfg.apiUrl, cfg.workspaceId, coderunnerId);
+    deploymentId = current?.id?.trim();
+  }
+  if (!deploymentId) {
+    throw new Error(
+      `No current deployment for coderunner ${coderunnerId}. Pass --deployment-id.`
+    );
+  }
+  await deleteCoderunnerDeployment(
+    cfg.apiUrl,
+    cfg.workspaceId,
+    coderunnerId,
+    deploymentId
+  );
+  process.stdout.write(
+    `Deleted deployment ${deploymentId} for coderunner ${coderunnerId}
+`
+  );
+}
+
+// src/commands/environments.ts
+async function environmentsListCommand(opts) {
+  const cfg = await resolveConfig({ workspaceId: opts.workspace });
+  if (!cfg.workspaceId) {
+    throw new Error(
+      "No workspace selected. Run `gf workspaces use <id>` or pass --workspace <id>."
+    );
+  }
+  const environments2 = await listWorkspaceEnvironments(
+    cfg.apiUrl,
+    cfg.workspaceId
+  );
+  if (opts.json) {
+    process.stdout.write(`${JSON.stringify(environments2, null, 2)}
+`);
+    return;
+  }
+  if (environments2.length === 0) {
+    process.stdout.write("No environments in this workspace.\n");
+    return;
+  }
+  for (const env of environments2) {
+    const status = env.status ?? "";
+    process.stdout.write(`${env.id}  ${env.name}  [${status}]
+`);
+  }
+}
+
 // src/process-log.ts
 var PROCESS_STATUS_LABELS = {
   1: "Pending",
@@ -1130,16 +1219,6 @@ async function diagnoseDeployFailure(opts) {
   });
 }
 
-// src/resolve-coderunner.ts
-async function resolveCoderunnerId(apiUrl, workspaceId, idOrSlug) {
-  const list = await listCoderunners(apiUrl, workspaceId);
-  const match = list.find((c) => c.id === idOrSlug || c.slug === idOrSlug);
-  if (!match) {
-    throw new Error(`Coderunner not found: ${idOrSlug}`);
-  }
-  return match.id;
-}
-
 // src/commands/logs.ts
 async function logsCommand(opts) {
   const cfg = await resolveConfig({ workspaceId: opts.workspace });
@@ -1405,6 +1484,30 @@ async function preflightNodePackage(sourceDir) {
   }
 }
 
+// src/deploy/schedule.ts
+var SCHEDULE_REQUIRED = 'workload type "schedule" requires --schedule "<cron>" or groundfloor.json "schedule".';
+var SCHEDULE_WRONG_TYPE = '--schedule / groundfloor.json "schedule" is only valid with --workload-type schedule.';
+function resolveDeploySchedule(opts) {
+  const cron = (opts.flag ?? opts.manifestSchedule)?.trim() || void 0;
+  if (opts.workloadType === "schedule") {
+    if (!cron) {
+      throw new Error(SCHEDULE_REQUIRED);
+    }
+    return cron;
+  }
+  if (cron) {
+    throw new Error(SCHEDULE_WRONG_TYPE);
+  }
+  return void 0;
+}
+
+// src/deploy/target.ts
+function formatDeployTarget(input) {
+  const label = input.workspaceName?.trim() ? `${input.workspaceName.trim()} (${input.workspaceId})` : input.workspaceId;
+  const cell = input.cell ?? "unknown";
+  return `Deploy target: workspace=${label} cell=${cell} api=${input.apiUrl}`;
+}
+
 // src/commands/deploy.ts
 var RUNTIMES = /* @__PURE__ */ new Set(["python", "node", "dotnet-script"]);
 var WORKLOAD_TYPES = /* @__PURE__ */ new Set(["function", "service", "job", "schedule"]);
@@ -1448,6 +1551,20 @@ async function deployCommand(opts) {
     );
   }
   const ws = cfg.workspaceId;
+  let workspaceName;
+  try {
+    const workspaces2 = await listWorkspaces(cfg.apiUrl);
+    workspaceName = workspaces2.find((item) => item.id === ws)?.name;
+  } catch {
+  }
+  log(
+    formatDeployTarget({
+      workspaceId: ws,
+      workspaceName,
+      cell: cfg.environment,
+      apiUrl: cfg.apiUrl
+    })
+  );
   log(
     opts.git ? `Cloning ${opts.git}${opts.ref ? ` (${opts.ref})` : ""}...` : `Packaging ${path4.resolve(opts.path ?? process.cwd())}...`
   );
@@ -1486,6 +1603,11 @@ async function deployCommand(opts) {
     if (runtime === "node") {
       await preflightNodePackage(pkg.sourceDir);
     }
+    const schedule = resolveDeploySchedule({
+      workloadType,
+      flag: opts.schedule,
+      manifestSchedule: manifest.schedule
+    });
     let coderunnerId = opts.coderunner;
     if (!coderunnerId) {
       const name = opts.name ?? manifest.name ?? (opts.git ? nameFromGitUrl(opts.git) : path4.basename(path4.resolve(opts.path ?? process.cwd())));
@@ -1587,7 +1709,8 @@ async function deployCommand(opts) {
       version_id: uploaded.version_id,
       cpu: opts.cpu ?? manifest.cpu,
       memory: opts.memory ?? manifest.memory,
-      envVariable: Object.keys(envVariable).length ? envVariable : void 0
+      envVariable: Object.keys(envVariable).length ? envVariable : void 0,
+      schedule
     });
     log("Waiting for deployment...");
     const deployDeadline = Date.now() + DEPLOY_POLL_TIMEOUT_MS;
@@ -2397,7 +2520,7 @@ import path7 from "path";
 import AdmZip4 from "adm-zip";
 
 // src/version.ts
-var GF_VERSION = "0.1.6";
+var GF_VERSION = "0.1.8";
 var GF_NPM_PACKAGE = "@groundfloorcloud/cli";
 
 // src/commands/apps-init.ts
@@ -2695,6 +2818,24 @@ async function resolveLatest(opts) {
   return cached?.latest ?? null;
 }
 
+// src/commander-exit.ts
+var QUIET_EXIT_CODES = /* @__PURE__ */ new Set([
+  "commander.version",
+  "commander.helpDisplayed"
+]);
+function isQuietCommanderExit(err) {
+  if (err == null || typeof err !== "object") return false;
+  const code = err.code;
+  return typeof code === "string" && QUIET_EXIT_CODES.has(code);
+}
+function commanderExitCode(err) {
+  if (err != null && typeof err === "object") {
+    const code = err.exitCode;
+    if (typeof code === "number") return code;
+  }
+  return 0;
+}
+
 // src/index.ts
 function collect(value, previous) {
   return previous.concat([value]);
@@ -2727,6 +2868,8 @@ program.command("logout").description("Clear the cached session").action(() => r
 program.command("whoami").description("Show the current identity and verify the Control Plane session").action(() => run(() => whoamiCommand()));
 program.command("token").description("Print a valid (auto-refreshed) access token to stdout").action(() => run(() => tokenCommand()));
 program.command("env").description('Print shell exports for `eval "$(gf env)"`').action(() => run(() => envCommand()));
+var environments = program.command("environments").alias("envs").description("List workspace environments");
+environments.command("list", { isDefault: true }).alias("ls").description("List environments in the default (or --workspace) workspace").option("-w, --workspace <id>", "Workspace id override").option("--json", "Output raw JSON").action((opts) => run(() => environmentsListCommand(opts)));
 var workspaces = program.command("workspaces").alias("ws").description("List workspaces or set the default workspace");
 workspaces.command("list", { isDefault: true }).description("List workspaces visible to your user").option("--json", "Output raw JSON").action((opts) => run(() => workspacesListCommand(opts)));
 workspaces.command("use <workspaceId>").description("Set the default workspace").action(
@@ -2735,6 +2878,15 @@ workspaces.command("use <workspaceId>").description("Set the default workspace")
 var coderunner = program.command("coderunner").alias("cr").description("Coderunner commands");
 coderunner.command("ls").alias("list").description("List coderunners in the default (or --workspace) workspace").option("-w, --workspace <id>", "Workspace id override").option("--json", "Output raw JSON").action((opts) => run(() => coderunnerListCommand(opts)));
 coderunner.command("status").description("Show coderunner status + current deployment JSON").requiredOption("-c, --coderunner <id|slug>", "Coderunner id or slug").option("-w, --workspace <id>", "Workspace id override").option("--json", "Output raw JSON").action((opts) => run(() => statusCommand(opts)));
+coderunner.command("cancel-deployment").description("Delete the current (or --deployment-id) deployment").requiredOption("-c, --coderunner <id|slug>", "Coderunner id or slug").option("-w, --workspace <id>", "Workspace id override").option("--deployment-id <id>", "Deployment id (default: current deployment)").action(
+  (opts) => run(
+    () => cancelDeploymentCommand({
+      workspace: opts.workspace,
+      coderunner: opts.coderunner,
+      deploymentId: opts.deploymentId
+    })
+  )
+);
 coderunner.command("logs").description("Show Process Log lines for a coderunner (stdout/stderr)").requiredOption("-c, --coderunner <id|slug>", "Coderunner id or slug").option("-w, --workspace <id>", "Workspace id override").option("--limit <n>", "Max lines (default 50)").option("--since-seconds <n>", "Lookback window in seconds (default 3600)").option("--search <text>", "Substring filter").option("--json", "Output raw JSON").action(
   (opts) => run(
     () => logsCommand({
@@ -2841,6 +2993,9 @@ program.command("deploy").description(
 ).option("-n, --name <name>", "Coderunner name (default: folder or repo name)").option("-p, --path <dir>", "Local directory to package (default: cwd)").option("--git <url>", "Clone and deploy a remote git/bitbucket repo").option("--ref <ref>", "Branch/tag/commit for --git").option("--subdir <dir>", "Subdirectory within the source to package").option("--runtime <runtime>", "python | node | dotnet-script").option(
   "--workload-type <type>",
   "function | service | job | schedule"
+).option(
+  "--schedule <cron>",
+  'Cron for --workload-type schedule (or groundfloor.json "schedule")'
 ).option(
   "--app-id <id>",
   "Bind newly created coderunner as a helper of this App (optional)"
@@ -2856,6 +3011,9 @@ function wireUnknownCommands(root, current, latest) {
         );
         process.exit(1);
       }
+      if (isQuietCommanderExit(err)) {
+        process.exit(commanderExitCode(err));
+      }
       throw err;
     });
     for (const child of cmd.commands) walk(child);
@@ -2879,6 +3037,10 @@ async function main() {
   await program.parseAsync(process.argv);
 }
 main().catch((err) => {
+  if (isQuietCommanderExit(err)) {
+    process.exitCode = commanderExitCode(err);
+    return;
+  }
   const message = err instanceof Error ? err.message : String(err);
   process.stderr.write(`Error: ${message}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groundfloorcloud/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Groundfloor gf CLI — sign in, deploy coderunners, publish Shell apps, and manage secrets, files, and Dataplane.",
   "type": "module",
   "bin": {