trainfabric 0.1.23 → 0.1.25

package/dist/index.cjs

@@ -7613,6 +7613,7 @@ var runCreateSchema = external_exports.object({
     repoUrl: external_exports.string().min(1).optional(),
     branch: external_exports.string().min(1).optional(),
     commitSha: external_exports.string().min(1).optional(),
+    entrypoint: external_exports.string().min(1).optional(),
     rootDirName: external_exports.string().min(1).optional(),
     files: external_exports.array(external_exports.object({
       path: external_exports.string().min(1),
@@ -7638,6 +7639,7 @@ var runtimeDetectSchema = external_exports.object({
     repoUrl: external_exports.string().min(1).optional(),
     branch: external_exports.string().min(1).optional(),
     commitSha: external_exports.string().min(1).optional(),
+    entrypoint: external_exports.string().min(1).optional(),
     rootDirName: external_exports.string().min(1).optional(),
     files: external_exports.array(external_exports.object({
       path: external_exports.string().min(1),
@@ -7661,6 +7663,7 @@ var runQuoteSchema = external_exports.object({
     repoUrl: external_exports.string().min(1).optional(),
     branch: external_exports.string().min(1).optional(),
     commitSha: external_exports.string().min(1).optional(),
+    entrypoint: external_exports.string().min(1).optional(),
     rootDirName: external_exports.string().min(1).optional(),
     files: external_exports.array(external_exports.object({
       path: external_exports.string().min(1),
@@ -8816,6 +8819,15 @@ var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var idPatterns = {
+  dataset: /^ds_[A-Za-z0-9_-]+$/,
+  deployment: /^dep_[A-Za-z0-9_-]+$/,
+  model: /^mdl_[A-Za-z0-9_-]+$/,
+  org: /^org_[A-Za-z0-9_-]+$/,
+  project: /^proj_[A-Za-z0-9_-]+$/,
+  run: /^run_[A-Za-z0-9_-]+$/
+};
+var allowedBillingUnits = /* @__PURE__ */ new Set(["normalized_tflop_seconds", "reserved_gpu_seconds", "usd"]);
 function collectRuntimeFiles(repoPath) {
   const manifestFiles = /* @__PURE__ */ new Set([
     "training.yaml",
@@ -8863,12 +8875,56 @@ function collectRuntimeFiles(repoPath) {
   walk(repoPath);
   return found.sort((left, right) => left.path.localeCompare(right.path));
 }
+function inferEntrypoint(files) {
+  const trainingYaml = files.find((file) => file.path === "training.yaml" || file.path === "train.runtime.yaml");
+  if (trainingYaml) {
+    const match = trainingYaml.content.match(/entrypoint\s*[:=]\s*["']?([A-Za-z0-9_./-]+)["']?/i);
+    if (match?.[1]) {
+      const entry = match[1];
+      const exact = files.find((file) => file.path === entry);
+      if (exact) {
+        return exact.path;
+      }
+      const nested = files.find((file) => file.path.endsWith(`/${entry}`));
+      if (nested) {
+        return nested.path;
+      }
+      return entry;
+    }
+  }
+  return files.find((file) => /(^|\/)train\.(py|sh)$/i.test(file.path))?.path;
+}
+function validateGitUrl(value) {
+  const url = new URL(value);
+  if (url.protocol !== "https:" && url.protocol !== "http:" && url.protocol !== "ssh:" && url.protocol !== "git:") {
+    throw new Error(`Invalid git URL "${value}". Use an absolute repository URL.`);
+  }
+  return value;
+}
+function validateRepoPath(repoPath) {
+  const absolute = import_node_path2.default.resolve(repoPath);
+  const parsed = import_node_path2.default.parse(absolute);
+  if (absolute === parsed.root || absolute === import_node_os.default.homedir()) {
+    throw new Error(`Refusing to package unsafe repository path: ${repoPath}`);
+  }
+  const stat = import_node_fs.default.statSync(absolute);
+  if (!stat.isDirectory()) {
+    throw new Error(`Repository path must be a directory: ${repoPath}`);
+  }
+  return absolute;
+}
 function buildSourceOptions(options) {
+  if (options.repo && options.git) {
+    throw new Error("Use either --repo or --git, not both.");
+  }
   if (options.repo) {
+    const repoPath = validateRepoPath(options.repo);
+    const files = collectRuntimeFiles(repoPath);
     return {
       source: {
         kind: "inline",
-        files: collectRuntimeFiles(import_node_path2.default.resolve(options.repo))
+        entrypoint: inferEntrypoint(files),
+        files
       }
     };
   }
@@ -8876,7 +8932,7 @@ function buildSourceOptions(options) {
     return {
       source: {
         kind: "git",
-        repoUrl: options.git,
+        repoUrl: validateGitUrl(options.git),
         branch: options.branch
       }
     };
@@ -8910,7 +8966,40 @@ function parseApiKeyScopes(input) {
   if (invalidScope) {
     throw new Error(`Invalid API key scope: ${invalidScope}`);
   }
-  return scopes;
+  return [...new Set(scopes)];
+}
+function normalizeHumanName(value, label) {
+  let name = String(value ?? "").trim();
+  while (name.length >= 2 && (name.startsWith("'") && name.endsWith("'") || name.startsWith('"') && name.endsWith('"'))) {
+    name = name.slice(1, -1).trim();
+  }
+  if (!/[A-Za-z0-9]/.test(name)) {
+    throw new Error(`${label} is required.`);
+  }
+  return name;
+}
+function normalizeId(value, kind, label) {
+  const id = String(value ?? "").trim();
+  if (!id || !idPatterns[kind].test(id)) {
+    throw new Error(`${label} is invalid.`);
+  }
+  return id;
+}
+function normalizeOptionalId(value, kind, label) {
+  if (value === void 0) {
+    return void 0;
+  }
+  return normalizeId(value, kind, label);
+}
+function normalizeOptionalBillingUnit(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  const unit = String(value).trim();
+  if (!allowedBillingUnits.has(unit)) {
+    throw new Error("Billing unit is invalid. Use normalized_tflop_seconds, reserved_gpu_seconds, or usd.");
+  }
+  return unit;
 }
 
 // src/run_input.ts
@@ -8954,7 +9043,7 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.23";
+var CLI_VERSION = "0.1.25";
 var CONFIG_DIR = import_node_path3.default.join(import_node_os2.default.homedir(), ".trainfabric");
 var CONFIG_PATH = import_node_path3.default.join(CONFIG_DIR, "config.json");
 var FALLBACK_SECRET_PATH = import_node_path3.default.join(CONFIG_DIR, "session.enc");
@@ -9293,7 +9382,7 @@ function visibleConfig(config) {
   };
 }
 function requireProjectId(options, config) {
-  const projectId = options.project ?? config.projectId;
+  const projectId = normalizeOptionalId(options.project ?? config.projectId, "project", "Project ID");
   if (!projectId) {
     throw new Error("Project is required. Pass --project <projectId> or run `trainfabric config:set-project <projectId>`.");
   }
@@ -9351,6 +9440,16 @@ function filterQuoteBundleForRequestedMode(bundle, options) {
     quotes: bundle.quotes.filter((item) => item.mode === options.mode || item.quote.mode === options.mode)
   };
 }
+function redactInlineSource(value) {
+  return JSON.parse(
+    JSON.stringify(value, (_key, current) => {
+      if (current && typeof current === "object" && typeof current.path === "string" && typeof current.content === "string") {
+        return { ...current, content: "<redacted>" };
+      }
+      return current;
+    })
+  );
+}
 async function watchRun(runId, json = false, timeoutMs, pollMs) {
   const handle = await createClient(loadConfig()).runs.watch(runId);
   if (json) {
@@ -9418,6 +9517,17 @@ function createClient(config) {
     projectId: config.projectId
   });
 }
+function assertReadableFile(filePath, label) {
+  let stats;
+  try {
+    stats = import_node_fs2.default.statSync(filePath);
+  } catch {
+    throw new Error(`${label} not found: ${filePath}`);
+  }
+  if (!stats.isFile()) {
+    throw new Error(`${label} must be a file: ${filePath}`);
+  }
+}
 function normalizeHttpBaseUrl(value) {
   let url;
   try {
@@ -9485,8 +9595,9 @@ program2.command("config:set-base-url").argument("<baseUrl>").description("Set t
   printJson(visibleConfig(config));
 });
 program2.command("config:set-org").argument("<orgId>").description("Set the default organization ID").action(async (orgId) => {
+  const normalizedOrgId = normalizeId(orgId, "org", "Organization ID");
   const currentConfig = loadConfig();
-  const organization = await createClient(currentConfig).organizations.get(String(orgId));
+  const organization = await createClient(currentConfig).organizations.get(normalizedOrgId);
   const updatedConfig = updateConfig((current) => {
     current.orgId = organization.id;
     if (current.projectId) {
@@ -9496,8 +9607,9 @@ program2.command("config:set-org").argument("<orgId>").description("Set the defa
   printJson(visibleConfig(updatedConfig));
 });
 program2.command("config:set-project").argument("<projectId>").description("Set the default project ID").action(async (projectId) => {
+  const normalizedProjectId = normalizeId(projectId, "project", "Project ID");
   const currentConfig = loadConfig();
-  const project = await createClient(currentConfig).projects.get(String(projectId));
+  const project = await createClient(currentConfig).projects.get(normalizedProjectId);
   if (currentConfig.orgId && project.organizationId !== currentConfig.orgId) {
     throw new Error(`Project ${project.id} does not belong to configured organization ${currentConfig.orgId}.`);
   }
@@ -9532,9 +9644,15 @@ program2.command("projects:list").description("List projects in the active organ
   printJson(await createClient(loadConfig()).projects.list());
 });
 program2.command("projects:create").requiredOption("--name <name>").option("--org <organizationId>").description("Create a project").action(async (options) => {
-  printJson(await createClient(loadConfig()).projects.create({ name: options.name, organizationId: options.org }));
+  printJson(
+    await createClient(loadConfig()).projects.create({
+      name: normalizeHumanName(options.name, "Project name"),
+      organizationId: normalizeOptionalId(options.org, "org", "Organization ID")
+    })
+  );
 });
 program2.command("datasets:validate").argument("<file>").description("Validate a local dataset file").action(async (file) => {
+  assertReadableFile(file, "Dataset path");
   const validation = await createClient(loadConfig()).datasets.validate({
     path: file,
     format: "chat_jsonl"
@@ -9545,22 +9663,26 @@ program2.command("datasets:validate").argument("<file>").description("Validate a
   }
 });
 program2.command("datasets:list").option("--project <projectId>").description("List datasets").action(async (options) => {
-  printJson(await createClient(loadConfig()).datasets.list(options.project));
+  printJson(await createClient(loadConfig()).datasets.list(normalizeOptionalId(options.project, "project", "Project ID")));
 });
 program2.command("datasets:get").argument("<datasetId>").description("Fetch dataset detail").action(async (datasetId) => {
-  printJson(await createClient(loadConfig()).datasets.get(String(datasetId)));
+  printJson(await createClient(loadConfig()).datasets.get(normalizeId(datasetId, "dataset", "Dataset ID")));
 });
 program2.command("datasets:delete").argument("<datasetId>").description("Delete a dataset").action(async (datasetId) => {
-  await createClient(loadConfig()).datasets.delete(String(datasetId));
-  printJson({ deleted: true, id: String(datasetId) });
+  const normalizedDatasetId = normalizeId(datasetId, "dataset", "Dataset ID");
+  await createClient(loadConfig()).datasets.delete(normalizedDatasetId);
+  printJson({ deleted: true, id: normalizedDatasetId });
 });
 program2.command("datasets:upload").argument("<file>").option("--project <projectId>").option("--name <name>").description("Upload a dataset through upload sessions").action(async (file, options) => {
+  assertReadableFile(file, "Dataset path");
   const config = loadConfig();
+  const projectId = normalizeOptionalId(options.project ?? config.projectId, "project", "Project ID");
+  const name = options.name === void 0 ? void 0 : normalizeHumanName(options.name, "Dataset name");
   const dataset = await createClient(config).datasets.create({
     path: file,
     format: "chat_jsonl",
-    name: options.name,
-    projectId: options.project ?? config.projectId
+    name,
+    projectId
   });
   printJson(dataset);
 });
@@ -9579,12 +9701,11 @@ program2.command("runtime:detect").option("--project <projectId>").option("--rep
     throw new Error("Provide --repo or --git.");
   }
   const config = loadConfig();
-  printJson(
-    await createClient(config).runtime.detect({
-      projectId: requireProjectId(options, config),
-      source: sourceOptions.source
-    })
-  );
+  const detection = await createClient(config).runtime.detect({
+    projectId: requireProjectId(options, config),
+    source: sourceOptions.source
+  });
+  printJson(redactInlineSource(detection));
 });
 program2.command("runtime:build").option("--project <projectId>").requiredOption("--detection <detectionId>").description("Build or reuse a cached runtime image from a runtime detection").action(async (options) => {
   const config = loadConfig();
@@ -9609,27 +9730,28 @@ program2.command("runs:quote").option("--project <projectId>").requiredOption("-
   }
 });
 program2.command("runs:list").option("--project <projectId>").description("List runs").action(async (options) => {
-  printJson(await createClient(loadConfig()).runs.list(options.project));
+  printJson(await createClient(loadConfig()).runs.list(normalizeOptionalId(options.project, "project", "Project ID")));
 });
 program2.command("runs:status").argument("<runId>").description("Fetch full run detail").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.get(String(runId)));
+  printJson(await createClient(loadConfig()).runs.get(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:logs").argument("<runId>").description("Fetch run logs").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.logs(String(runId)));
+  printJson(await createClient(loadConfig()).runs.logs(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:wait").argument("<runId>").option("--timeout <duration>", "maximum wait duration, for example 30s, 10m, or 1h").option("--poll <duration>", "poll interval, for example 1s or 500ms").description("Wait for a run to reach a terminal state").action(async (runId, options) => {
+  const normalizedRunId = normalizeId(runId, "run", "Run ID");
   printJson(
-    await createClient(loadConfig()).runs.wait(String(runId), {
+    await createClient(loadConfig()).runs.wait(normalizedRunId, {
       timeoutMs: parseDurationMs(options.timeout),
       pollMs: parsePositiveMs(options.poll, 1e3)
     })
   );
 });
 program2.command("runs:watch").argument("<runId>").option("--json", "emit event output as JSON").option("--timeout <duration>", "maximum watch duration, for example 30s, 10m, or 1h").option("--poll <duration>", "poll interval, for example 1s or 500ms").description("Stream a run until it completes").action(async (runId, options) => {
-  await watchRun(String(runId), Boolean(options.json), parseDurationMs(options.timeout), parsePositiveMs(options.poll, 1e3));
+  await watchRun(normalizeId(runId, "run", "Run ID"), Boolean(options.json), parseDurationMs(options.timeout), parsePositiveMs(options.poll, 1e3));
 });
 program2.command("runs:usage").argument("<runId>").option("--summary", "print a human-readable cost summary instead of raw JSON").description("Fetch run usage summary").action(async (runId, options) => {
-  const usage = await createClient(loadConfig()).runs.usage(String(runId));
+  const usage = await createClient(loadConfig()).runs.usage(normalizeId(runId, "run", "Run ID"));
   if (options.summary) {
     printUsageSummary(usage);
   } else {
@@ -9637,7 +9759,7 @@ program2.command("runs:usage").argument("<runId>").option("--summary", "print a
   }
 });
 program2.command("runs:cost-breakdown").argument("<runId>").option("--summary", "print a human-readable cost summary instead of raw JSON").description("Fetch realized run cost and profitability").action(async (runId, options) => {
-  const breakdown = await createClient(loadConfig()).runs.costBreakdown(String(runId));
+  const breakdown = await createClient(loadConfig()).runs.costBreakdown(normalizeId(runId, "run", "Run ID"));
   if (options.summary) {
     printUsageSummary(breakdown);
   } else {
@@ -9645,22 +9767,22 @@ program2.command("runs:cost-breakdown").argument("<runId>").option("--summary",
   }
 });
 program2.command("runs:allocation").argument("<runId>").description("Fetch run allocation").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.allocation(String(runId)));
+  printJson(await createClient(loadConfig()).runs.allocation(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:configuration").argument("<runId>").description("Fetch run placement configuration").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.configuration(String(runId)));
+  printJson(await createClient(loadConfig()).runs.configuration(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:explanation").argument("<runId>").description("Fetch run planning explanation").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.explanation(String(runId)));
+  printJson(await createClient(loadConfig()).runs.explanation(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:cancel").argument("<runId>").description("Cancel a run").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.cancel(String(runId)));
+  printJson(await createClient(loadConfig()).runs.cancel(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:resume").argument("<runId>").description("Resume a run from the latest checkpoint").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.resume(String(runId)));
+  printJson(await createClient(loadConfig()).runs.resume(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("runs:terminate").argument("<runId>").description("Terminate a queued, launchable, or active run").action(async (runId) => {
-  printJson(await createClient(loadConfig()).runs.terminate(String(runId)));
+  printJson(await createClient(loadConfig()).runs.terminate(normalizeId(runId, "run", "Run ID")));
 });
 program2.command("cluster:capacity").description("Fetch cluster capacity view").action(async () => {
   printJson(await createClient(loadConfig()).cluster.getCapacity());
@@ -9678,20 +9800,33 @@ program2.command("deployments:list").description("List deployments").action(asyn
   printJson(await createClient(loadConfig()).deployments.list());
 });
 program2.command("deployments:create").requiredOption("--model <modelId>").option("--project <projectId>", "accepted for consistency; deployment project is inferred from the model").description("Create a deployment for a model").action(async (options) => {
-  printJson(await createClient(loadConfig()).deployments.create({ modelId: options.model }));
+  const config = loadConfig();
+  const client = createClient(config);
+  const projectId = normalizeOptionalId(options.project, "project", "Project ID");
+  if (projectId) {
+    await client.projects.get(projectId);
+  }
+  const modelId = normalizeId(options.model, "model", "Model ID");
+  printJson(await client.deployments.create({ modelId }));
 });
 program2.command("deployments:get").argument("<deploymentId>").description("Fetch a deployment").action(async (deploymentId) => {
-  printJson(await createClient(loadConfig()).deployments.get(String(deploymentId)));
+  printJson(await createClient(loadConfig()).deployments.get(normalizeId(deploymentId, "deployment", "Deployment ID")));
 });
 program2.command("deployments:delete").argument("<deploymentId>").description("Delete a pending or cataloged deployment").action(async (deploymentId) => {
-  await createClient(loadConfig()).deployments.delete(String(deploymentId));
-  printJson({ deleted: true, id: String(deploymentId) });
+  const normalizedDeploymentId = normalizeId(deploymentId, "deployment", "Deployment ID");
+  await createClient(loadConfig()).deployments.delete(normalizedDeploymentId);
+  printJson({ deleted: true, id: normalizedDeploymentId });
 });
 program2.command("billing:summary").description("Fetch billing summary").action(async () => {
   printJson(await createClient(loadConfig()).billing.getSummary());
 });
 program2.command("billing:usage").option("--unit <unit>", "normalized_tflop_seconds, reserved_gpu_seconds, or usd").option("--run <runId>", "filter usage records to one run").description("List billing usage records").action(async (options) => {
-  printJson(await createClient(loadConfig()).billing.getUsage(options.unit, options.run));
+  printJson(
+    await createClient(loadConfig()).billing.getUsage(
+      normalizeOptionalBillingUnit(options.unit),
+      normalizeOptionalId(options.run, "run", "Run ID")
+    )
+  );
 });
 program2.command("billing:invoices").description("List invoices").action(async () => {
   printJson(await createClient(loadConfig()).billing.listInvoices());
@@ -9724,7 +9859,7 @@ program2.command("api-keys:create").requiredOption("--name <name>").option("--ow
   const config = loadConfig();
   const session = await createClient(config).auth.me();
   const apiKey = await createClient(config).apiKeys.create({
-    name: options.name,
+    name: normalizeHumanName(options.name, "API key name"),
     ownerType: options.ownerType,
     ownerId: options.ownerId ?? session.user.id,
     scopes: parseApiKeyScopes(String(options.scopes))
@@ -9741,7 +9876,7 @@ program2.command("api-keys:revoke").argument("<apiKeyId>").description("Revoke a
 program2.command("service-accounts:create").requiredOption("--name <name>").option("--scopes <scopes>", "comma-separated scopes", "org:read,project:read,project:write,dataset:read,dataset:write,run:read,run:write").description("Create a service account").action(async (options) => {
   printJson(
     await createClient(loadConfig()).serviceAccounts.create({
-      name: options.name,
+      name: normalizeHumanName(options.name, "Service account name"),
       scopes: parseApiKeyScopes(String(options.scopes))
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trainfabric",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Trainfabric CLI for launching GPU training jobs on the hosted Trainfabric backend.",
   "type": "module",
   "main": "dist/index.cjs",