@tinycloud-ai/tinycloud-cli 0.1.1 → 0.1.3

package/dist/main.js

@@ -5,6 +5,11 @@ import { existsSync as existsSync3, readFileSync as readFileSync4, writeFileSync
 import { basename, join as join5, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 
+// ../../packages/domain/src/cli.ts
+var CLI_PACKAGE = "@tinycloud-ai/tinycloud-cli";
+var CLI_VERSION = "0.1.2";
+var CLI_SPEC = `${CLI_PACKAGE}@${CLI_VERSION}`;
+
 // ../../packages/domain/src/ids.ts
 var lastRandom = new Uint8Array(10);
 
@@ -15,6 +20,7 @@ var ERROR_CODES = {
   AUTH_PROVIDER_REQUIRED: 501,
   FORBIDDEN: 403,
   NOT_FOUND: 404,
+  METHOD_NOT_ALLOWED: 405,
   CONFLICT: 409,
   PRECONDITION_FAILED: 412,
   VALIDATION_FAILED: 422,
@@ -28,7 +34,6 @@ var ERROR_CODES = {
   MANIFEST_UNSUPPORTED_API_VERSION: 422,
   // Planning / provider
   TARGET_INCOMPATIBLE: 422,
-  APPROVAL_REQUIRED: 409,
   PLAN_EXPIRED: 409,
   PLAN_STALE: 409,
   PROVIDER_UNAVAILABLE: 503,
@@ -89,9 +94,9 @@ var RETRYABLE = /* @__PURE__ */ new Set([
 ]);
 var DEFAULT_REMEDIATION = {
   UNAUTHENTICATED: "Run `tiny login` and retry.",
+  METHOD_NOT_ALLOWED: "Use one of the methods named in the Allow response header.",
   AUTH_PROVIDER_REQUIRED: "Configure a trusted OIDC provider for this gateway.",
   FORBIDDEN: "Ask an organization admin for the required role.",
-  APPROVAL_REQUIRED: "Ask an organization admin to approve the plan, then deploy again with the approved plan ID.",
   PLAN_STALE: "Run `tiny plan` again; the manifest or policy changed since this plan was produced.",
   MIGRATION_CHECKSUM_CHANGED: "Restore the original migration file and add a new migration instead.",
   INTERACTION_REQUIRED: "Re-run interactively, or pass the flag named in details.missingInput.",
@@ -121,8 +126,6 @@ function parseDuration(value) {
 var DEFAULT_ORGANIZATION_POLICY = {
   allowPublicApps: false,
   allowRawSecrets: true,
-  requireApprovalForCapabilities: true,
-  requireApprovalForRawSecrets: true,
   maxAppsPerOrg: 500,
   maxPreviewTtlHours: 168,
   maxMemoryMiB: 2048,
@@ -973,8 +976,14 @@ var DEFAULT_LIMITS = {
   maxTotalBytes: 50 * 1024 * 1024,
   maxFileBytes: 10 * 1024 * 1024
 };
-function loadIgnores(root) {
-  const patterns = [...DEFAULT_IGNORES];
+var BUILD_OUTPUT_IGNORES = DEFAULT_IGNORES.filter((pattern) => pattern !== "node_modules");
+var BUILD_OUTPUT_LIMITS = {
+  maxFiles: 6e4,
+  maxTotalBytes: 400 * 1024 * 1024,
+  maxFileBytes: 50 * 1024 * 1024
+};
+function loadIgnores(root, base = DEFAULT_IGNORES) {
+  const patterns = [...base];
   const file = join2(root, ".tinyignore");
   if (existsSync(file)) {
     for (const line of readFileSync2(file, "utf8").split("\n")) {
@@ -994,8 +1003,8 @@ function matches(pattern, path) {
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function packSource(root, limits = DEFAULT_LIMITS) {
-  const ignores = loadIgnores(root);
+function packSource(root, limits = DEFAULT_LIMITS, baseIgnores = DEFAULT_IGNORES) {
+  const ignores = loadIgnores(root, baseIgnores);
   const files = [];
   const skippedSecrets = [];
   let sizeBytes = 0;
@@ -1092,6 +1101,9 @@ var STORAGE_LIMITS = {
   maxConcurrentOperationsPerEnvironment: 16
 };
 
+// ../../packages/orchestrator/src/lifecycle.ts
+var MAX_DELETE_GRACE_MS = 90 * 864e5;
+
 // ../../packages/db/src/store.ts
 import { dirname as dirname3, join as join3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -1165,7 +1177,11 @@ var ApiClient = class {
     return this.request("DELETE", path, query ? { query } : {});
   }
   uploadDirectory(directory) {
-    return this.post("/v1/artifacts", createArtifactUpload(directory));
+    return this.uploadArtifact(createArtifactUpload(directory));
+  }
+  /** Upload a source tree the caller has already packed, from wherever it read it. */
+  uploadArtifact(upload) {
+    return this.post("/v1/artifacts", upload);
   }
 };
 
@@ -1252,6 +1268,16 @@ function failureRemediation(record) {
   const remediation = record?.errorDetail?.remediation;
   return typeof remediation === "string" && remediation !== "" ? remediation : "Read `tiny logs` for the failure, fix it, and deploy again.";
 }
+function failureCode(record) {
+  const code = record?.errorCode;
+  return typeof code === "string" && code in ERROR_CODES ? code : "PROVIDER_UNAVAILABLE";
+}
+function failureLogs(record) {
+  const details = record?.errorDetail?.details;
+  if (typeof details !== "object" || details === null) return null;
+  const logs = details.logs;
+  return typeof logs === "string" && logs.trim() !== "" ? logs.replace(/\s+$/, "") : null;
+}
 
 // ../cli/src/output.ts
 var CLI_API_VERSION = "cli.tinycloud.dev/v1";
@@ -1277,7 +1303,6 @@ var EXIT_BY_CODE = {
   MANIFEST_SCHEMA_INVALID: EXIT.validation,
   MANIFEST_POLICY_VIOLATION: EXIT.policy,
   MANIFEST_UNSUPPORTED_API_VERSION: EXIT.validation,
-  APPROVAL_REQUIRED: EXIT.policy,
   PLAN_STALE: EXIT.conflict,
   PLAN_EXPIRED: EXIT.conflict,
   TARGET_INCOMPATIBLE: EXIT.validation,
@@ -1388,7 +1413,7 @@ var USAGE = `tiny \u2014 governed runtime for small internal apps
   tiny init [name]                           Write a starter tiny.yaml
   tiny validate                              Parse and check tiny.yaml
   tiny plan [--env production]               Show what a deploy would do (never mutates)
-  tiny deploy [--env production] [--yes]     Deploy and watch it finish
+  tiny deploy [--env production]             Deploy and watch it finish
              [--no-wait] [--wait <seconds>]
   tiny status                                Show apps and their lifecycle status
   tiny logs [app] [--since 1h] [--limit 100] Read bounded logs
@@ -1397,12 +1422,13 @@ var USAGE = `tiny \u2014 governed runtime for small internal apps
 
   tiny access list|grant|revoke <subject> [--role user]
   tiny secrets set <name>|list
-  tiny capabilities list|request <operation> --connection <name>
+  tiny capabilities list|grant <operation> --connection <name>
   tiny preview create [--ttl 72h]|delete <environment>
 
   tiny archive [app]                         Snapshot and deactivate
   tiny restore [app]                         Reactivate an archived app
-  tiny delete [app] --confirm <slug>         Schedule deletion
+  tiny delete [app] --confirm <slug> [--grace 7d]
+                                             Schedule deletion (--grace 0 deletes now)
   tiny doctor                                Check auth, manifest files, and target reachability
 
 Global flags: --json  --api <url>  --token <token>  --cwd <path>  --idempotency-key <key>
@@ -1628,21 +1654,12 @@ Service account token (shown once): ${created.apiToken}`);
         environment: typeof args.flags.env === "string" ? args.flags.env : void 0
       });
       if (args.flags.json !== true) printPlan(output, planned.plan, planned.warnings);
-      if (planned.plan.approvals.length > 0 && args.flags.yes !== true && !isInteractive()) {
-        throw new TinyError("APPROVAL_REQUIRED", "This deployment needs approval and no terminal is attached.", {
-          details: { approvals: planned.plan.approvals, planId: planned.plan.planId, nextActions: [
-            "Ask an organization admin to approve the plan.",
-            "Re-run `tiny deploy --yes` once approved."
-          ] }
-        });
-      }
       output.progress("Deploying\u2026");
       const result = await client.post("/v1/apps:deploy", {
         artifactUri: artifact.artifactUri,
         manifest: source,
         environment: typeof args.flags.env === "string" ? args.flags.env : void 0,
-        planId: planned.plan.planId,
-        approve: args.flags.yes === true
+        planId: planned.plan.planId
       }, typeof args.flags["idempotency-key"] === "string" ? args.flags["idempotency-key"] : void 0);
       const settled = args.flags["no-wait"] === true ? null : await awaitDeployment(
         () => client.get(`/v1/deployments/${result.deploymentId}`),
@@ -1650,31 +1667,38 @@ Service account token (shown once): ${created.apiToken}`);
       );
       const status = settled?.status ?? result.status;
       const build = buildSummary(settled?.providerState);
-      output.result(
-        {
-          appId: result.appId,
-          deploymentId: result.deploymentId,
-          status,
-          url: result.url,
-          warnings: result.warnings,
-          ...build ? { build } : {}
-        },
-        () => {
-          output.progress("");
-          const built = describeBuild(build);
-          if (built) output.step(true, built);
-          if (settled === null) {
-            output.progress(args.flags["no-wait"] === true ? `\u2192 Deployment ${result.deploymentId} is ${status}. Follow it with \`tiny logs\`.` : `\u2192 Deployment ${result.deploymentId} is still running after ${Math.round(waitTimeoutMs(args) / 1e3)}s. Follow it with \`tiny logs\`.`);
-          } else {
-            output.step(status === "ready", `Deployment ${result.deploymentId} is ${status}`);
-            if (settled.errorCode) output.warn(`${settled.errorCode}: ${describeFailure(settled)}`);
-          }
-          output.step(true, `URL: ${result.url}`);
-          for (const warning of result.warnings) output.warn(warning);
+      const payload = {
+        appId: result.appId,
+        deploymentId: result.deploymentId,
+        status,
+        // Same reason the human output withholds it: nothing the caller
+        // deployed is behind that URL.
+        ...status === "failed" ? {} : { url: result.url },
+        warnings: result.warnings,
+        ...build ? { build } : {}
+      };
+      const report = status === "failed" ? (human) => {
+        if (args.flags.json !== true) human();
+      } : (human) => output.result(payload, human);
+      report(() => {
+        output.progress("");
+        const built = describeBuild(build);
+        if (built) output.step(true, built);
+        if (settled === null) {
+          output.progress(args.flags["no-wait"] === true ? `\u2192 Deployment ${result.deploymentId} is ${status}. Follow it with \`tiny logs\`.` : `\u2192 Deployment ${result.deploymentId} is still running after ${Math.round(waitTimeoutMs(args) / 1e3)}s. Follow it with \`tiny logs\`.`);
+        } else {
+          output.step(status === "ready", `Deployment ${result.deploymentId} is ${status}`);
+          if (settled.errorCode) output.warn(`${settled.errorCode}: ${describeFailure(settled)}`);
+          const logs = failureLogs(settled);
+          if (logs) output.progress(`
+${logs}
+`);
         }
-      );
+        if (status !== "failed") output.step(true, `URL: ${result.url}`);
+        for (const warning of result.warnings) output.warn(warning);
+      });
       if (status === "failed") {
-        throw new TinyError("PROVIDER_UNAVAILABLE", `Deployment ${result.deploymentId} failed: ${describeFailure(settled)}`, {
+        throw new TinyError(failureCode(settled), `Deployment ${result.deploymentId} failed: ${describeFailure(settled)}`, {
           // The deployer recorded why and what to do about it; repeating its
           // own remediation beats a generic pointer at the logs.
           remediation: failureRemediation(settled),
@@ -1812,10 +1836,10 @@ Service account token (shown once): ${created.apiToken}`);
         });
         return;
       }
-      if (args.subcommand === "request") {
+      if (args.subcommand === "grant") {
         const operation = args.positional[0];
         const connection = typeof args.flags.connection === "string" ? args.flags.connection : null;
-        if (!operation || !connection) throw usageError("tiny capabilities request <operation> --connection <name>");
+        if (!operation || !connection) throw usageError("tiny capabilities grant <operation> --connection <name>");
         const appRef = typeof args.flags.app === "string" ? args.flags.app : parseManifest(readManifest(cwd).source).normalized.metadata.name;
         const app = await resolveApp(client, appRef);
         const grant = await client.post(`/v1/apps/${app.id}/capability-grants`, {
@@ -1823,12 +1847,11 @@ Service account token (shown once): ${created.apiToken}`);
           operations: [operation]
         });
         output.result({ grantId: grant.id, status: grant.status, operation }, () => {
-          output.step(grant.status === "approved", `Grant ${grant.id} is ${grant.status}`);
-          if (grant.status === "pending") output.progress("An organization admin must approve it before the app can call the operation.");
+          output.step(true, `${appRef} can now ${operation} on ${connection}.`);
         });
         return;
       }
-      throw usageError("tiny capabilities list|request");
+      throw usageError("tiny capabilities list|grant");
     }
     // --------------------------------------------------------- preview
     case "preview": {
@@ -1884,10 +1907,11 @@ Service account token (shown once): ${created.apiToken}`);
           details: { missingInput: "--confirm", expected: app.slug }
         });
       }
-      const scheduled = await client.del(`/v1/apps/${app.id}`, { confirm });
+      const grace = typeof args.flags.grace === "string" ? args.flags.grace : void 0;
+      const scheduled = await client.del(`/v1/apps/${app.id}`, { confirm, grace });
       output.result(
-        { appId: app.id, deleteAfter: scheduled.deleteAfter },
-        () => output.step(true, `${app.slug} will be deleted after ${scheduled.deleteAfter}.`)
+        { appId: app.id, status: scheduled.status, deleteAfter: scheduled.deleteAfter },
+        () => output.step(true, scheduled.status === "deleted" ? `${app.slug} deleted.` : `${app.slug} will be deleted after ${scheduled.deleteAfter}. Run "tiny restore ${app.slug}" to cancel.`)
       );
       return;
     }
@@ -1922,7 +1946,7 @@ function printPlan(output, plan, warnings) {
   output.progress(`  risk: ${plan.riskTier}${plan.estimatedMonthlyCents === null ? "" : `   estimate: $${(plan.estimatedMonthlyCents / 100).toFixed(2)}/mo`}`);
   for (const warning of [...warnings, ...plan.warnings]) output.warn(warning);
   for (const problem of plan.incompatibilities) output.warn(`incompatible: ${problem}`);
-  for (const approval of plan.approvals) output.warn(`approval required \u2014 ${approval.code}: ${approval.detail}`);
+  for (const notice of plan.notices) output.warn(notice.detail);
   output.progress("");
 }
 function usageError(usage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinycloud-ai/tinycloud-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Command-line client for deploying and managing governed, isolated internal apps on Tinycloud.",
   "license": "UNLICENSED",
   "type": "module",