@sixb/cli-core 0.1.8 → 0.1.10

package/src/commands/shared.ts

@@ -4,6 +4,12 @@ import { fail } from "../output"
 
 export type QueryOptions = Record<string, string | undefined>
 
+/** An id as one segment of an API path: `.` or `..` would name another route. */
+export function idSegment(value: string | undefined): string {
+  if (!value || value === "." || value === "..") fail(`'${value ?? ""}' is not an id.`)
+  return encodeURIComponent(value)
+}
+
 /** Parse flag/value pairs into API query parameters. */
 
 export function parseQueryOptions(
@@ -55,13 +61,7 @@ export function singleFileOption(args: readonly string[], command: string): stri
 }
 
 export async function readJson(source: string): Promise<unknown> {
-  let text: string
-  try {
-    text = source === "-" ? await readStdin() : await readFile(source, "utf8")
-  } catch (error) {
-    if (isFileError(error, "ENOENT")) fail(`JSON file '${source}' does not exist.`)
-    throw error
-  }
+  const text = await readText(source, "JSON file")
   try {
     return JSON.parse(text)
   } catch {
@@ -74,6 +74,16 @@ export async function readJson(source: string): Promise<unknown> {
   }
 }
 
+/** A file's text, or standard input's when the source is `-`. */
+export async function readText(source: string, noun: string): Promise<string> {
+  try {
+    return source === "-" ? await readStdin() : await readFile(source, "utf8")
+  } catch (error) {
+    if (isFileError(error, "ENOENT")) fail(`${noun} '${source}' does not exist.`)
+    throw error
+  }
+}
+
 export function asRecord(value: unknown): Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value)
     ? (value as Record<string, unknown>)

package/src/commands/system.ts

@@ -0,0 +1,67 @@
+import { readFile } from "node:fs/promises"
+import { isHelp } from "../arguments"
+import { CliError, EXIT_API, fail, INSTANCE_CLI_VERSION, writeJson, writeText } from "../output"
+import { createInstanceApiClient, type SandboxInstanceCliMode } from "../run"
+import { asRecord, isFileError } from "./shared"
+
+/** The sandbox runtime `sixb status` reports and the agent worker's preflight expects. */
+export const AGENT_RUNTIME_PROFILE = "sixb-agent-runtime/v1" as const
+
+/** Stable JSON emitted by `sixb status` in a sandbox and consumed by worker preflight. */
+export interface SandboxStatusReport {
+  readonly ok: true
+  readonly profile: typeof AGENT_RUNTIME_PROFILE
+  readonly cli: { readonly version: string }
+  readonly javascript: {
+    readonly name: "bun" | "node"
+    readonly version: string
+  }
+  readonly project: { readonly id: string }
+}
+
+export async function status(args: readonly string[], mode: SandboxInstanceCliMode): Promise<void> {
+  if (isHelp(args[0])) return writeText("Usage: sixb status")
+  // Its output is JSON either way: --json, which people's `sixb status` takes, changes nothing.
+  if (args.some((arg) => arg !== "--json")) fail("status accepts no arguments but --json.")
+  const project = asRecord(await createInstanceApiClient(mode).get("/api/project"))
+  if (typeof project.id !== "string" || project.id.length === 0) {
+    throw new CliError(
+      { code: "invalid_api_response", message: "The Sixb API returned an invalid project." },
+      EXIT_API
+    )
+  }
+  const report: SandboxStatusReport = {
+    ok: true,
+    profile: AGENT_RUNTIME_PROFILE,
+    cli: { version: INSTANCE_CLI_VERSION },
+    javascript: javascriptRuntime(),
+    project: { id: project.id },
+  }
+  writeJson(report)
+}
+
+export async function context(args: readonly string[]): Promise<void> {
+  if (isHelp(args[0])) return writeText("Usage: sixb context")
+  if (args.length !== 0) fail("context accepts no arguments.")
+  const path = process.env.SIXB_RUN_CONTEXT
+  if (!path) fail("SIXB_RUN_CONTEXT is not set.")
+  let text: string
+  try {
+    text = await readFile(path, "utf8")
+  } catch (error) {
+    if (isFileError(error, "ENOENT")) fail(`Run context '${path}' does not exist.`)
+    throw error
+  }
+  try {
+    writeJson(JSON.parse(text))
+  } catch {
+    fail(`Run context '${path}' is not valid JSON.`, "invalid_json")
+  }
+}
+
+function javascriptRuntime(): SandboxStatusReport["javascript"] {
+  if (typeof globalThis.Bun === "object") {
+    return { name: "bun", version: globalThis.Bun.version }
+  }
+  return { name: "node", version: process.versions.node }
+}

package/src/commands/telemetry.ts

@@ -11,7 +11,7 @@ import {
 import { fail, writeJson, writeText } from "../output"
 import { CLI_LIMITS, DEFAULT_TELEMETRY_ORDER } from "../policies"
 import { GROUP_HELP } from "./metadata"
-import { normalizeWindowOptions, readJson, singleFileOption } from "./shared"
+import { idSegment, normalizeWindowOptions, readJson, singleFileOption } from "./shared"
 
 export async function telemetry(api: ApiClient, args: readonly string[]): Promise<void> {
   const [sub, ...rest] = args
@@ -62,7 +62,7 @@ export async function telemetry(api: ApiClient, args: readonly string[]): Promis
 }
 
 function telemetryPath(args: readonly string[], terminal: "latest" | "history"): string {
-  return `/api/objects/${encodeURIComponent(args[0] ?? "")}/${encodeURIComponent(args[1] ?? "")}/telemetry/${encodeURIComponent(args[2] ?? "")}/${terminal}`
+  return `/api/objects/${idSegment(args[0])}/${idSegment(args[1])}/telemetry/${idSegment(args[2])}/${terminal}`
 }
 
 function normalizeTelemetryQueryInput(input: unknown): Record<string, unknown> {

package/src/commands/users.ts

@@ -0,0 +1,87 @@
+import type { ApiClient } from "../api-client"
+import {
+  enumValue,
+  integerInRange,
+  isHelp,
+  nonNegativeInteger,
+  parseCommandArgs,
+  requestsHelp,
+} from "../arguments"
+import { CliError, EXIT_API, fail, writeJson, writeText } from "../output"
+import { CLI_LIMITS } from "../policies"
+import { GROUP_HELP } from "./metadata"
+import type { QueryOptions } from "./shared"
+import { idSegment } from "./shared"
+
+const USER_STATUSES = ["active", "suspended", "all"] as const
+
+const LIST_FLAGS = {
+  "--status": "string",
+  "--limit": "string",
+  "--offset": "string",
+} as const
+
+export async function users(api: ApiClient, args: readonly string[]): Promise<void> {
+  const [sub, ...rest] = args
+  if (!sub || isHelp(sub) || requestsHelp(rest)) return writeText(GROUP_HELP.users)
+
+  if (sub === "get") {
+    const { positionals } = parseCommandArgs(rest, {}, "users get", 1)
+    const user = positionals[0]?.trim()
+    if (!user) fail("users get requires a user id or email.")
+    // Sign-in mints ids as `usr_<uuid>`, so an `@` marks an email.
+    if (!user.includes("@")) {
+      return writeJson(await api.get(`/api/users/${idSegment(user)}`))
+    }
+
+    const page = await api.get("/api/users", { email: user })
+    const [member] = isRecord(page) && Array.isArray(page.users) ? page.users : []
+    if (member === undefined) {
+      throw new CliError(
+        { code: "not_found", message: `No member has the email '${user}'.` },
+        EXIT_API
+      )
+    }
+    return writeJson(member)
+  }
+
+  if (sub === "list") {
+    const { options } = parseCommandArgs(rest, LIST_FLAGS, "users list")
+    return writeJson(await api.get("/api/users", listQuery(options)))
+  }
+
+  if (sub === "search") {
+    const { positionals, options } = parseCommandArgs(rest, LIST_FLAGS, "users search", 1)
+    const search = positionals[0]?.trim()
+    if (!search) fail("users search requires the text to find in a name or email.")
+
+    return writeJson(await api.get("/api/users", { ...listQuery(options), search }))
+  }
+
+  fail(`Unknown users command '${sub}'.`)
+}
+
+function listQuery(options: {
+  readonly "--status"?: string
+  readonly "--limit"?: string
+  readonly "--offset"?: string
+}): QueryOptions {
+  const limit = integerInRange(
+    "--limit",
+    options["--limit"] ?? String(CLI_LIMITS.users.default),
+    1,
+    CLI_LIMITS.users.maximum
+  )
+
+  return {
+    status: enumValue("--status", options["--status"] ?? "active", USER_STATUSES),
+    limit: String(limit),
+    ...(options["--offset"] === undefined
+      ? {}
+      : { offset: String(nonNegativeInteger("--offset", options["--offset"])) }),
+  }
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+}

package/src/commands/workflows.ts

@@ -1,8 +1,9 @@
+import { randomUUID } from "node:crypto"
 import type { ApiClient } from "../api-client"
 import { isHelp, parseCommandArgs, requestsHelp } from "../arguments"
-import { fail, writeJson, writeText } from "../output"
+import { fail, writeJson, writeRequestResult, writeText } from "../output"
 import { GROUP_HELP } from "./metadata"
-import { readJson } from "./shared"
+import { idSegment, readJson } from "./shared"
 
 export async function workflows(api: ApiClient, args: readonly string[]): Promise<void> {
   const [sub, ...rest] = args
@@ -15,19 +16,24 @@ export async function workflows(api: ApiClient, args: readonly string[]): Promis
     const {
       positionals: [workflowId],
     } = parseCommandArgs(rest, {}, "workflows get", 1)
-    return writeJson(await api.get(`/api/workflows/${encodeURIComponent(workflowId ?? "")}`))
+    return writeJson(await api.get(`/api/workflows/${idSegment(workflowId)}`))
   }
   if (sub === "start") {
     const {
       positionals: [workflowId],
       options,
-    } = parseCommandArgs(rest, { "--file": "string" }, "workflows start", 1)
+    } = parseCommandArgs(rest, { "--file": "string", "--run-id": "string" }, "workflows start", 1)
     const input: unknown = options["--file"] ? await readJson(options["--file"]) : {}
     if (Array.isArray(input) || typeof input !== "object" || input === null) {
       fail("Workflow input must be a JSON object.")
     }
-    return writeJson(
-      await api.post(`/api/workflows/${encodeURIComponent(workflowId ?? "")}/runs`, { input })
+    // Every start names its run, so a repeated request returns the same run instead of another.
+    const runId = options["--run-id"] ?? `run_${randomUUID()}`
+    return writeRequestResult(
+      await api.post(`/api/workflows/${idSegment(workflowId)}/runs`, {
+        input,
+        runId,
+      })
     )
   }
   fail(`Unknown workflows command '${sub}'.`)