@biznetgio/neo-app 0.4.30 → 0.4.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biznetgio/neo-app",
-  "version": "0.4.30",
+  "version": "0.4.32",
   "description": "NEO App CLI — one-command agent onboarding, MCP server, and project ops for coding agents (Codex, Claude Code).",
   "type": "module",
   "bin": {

package/src/deploySource.js

@@ -273,7 +273,8 @@ export async function deploySource(api, { projectId, src, name, port, build, ser
     try {
       const book = (await api.get('/api/v1/pricing')).data;
       estimatedCost = estimateCost(book, { computeTier: 'micro' });
-      log(`[dry-run] estimated cost (default micro compute, ${svcType}): ~${estimatedCost.monthly} ${estimatedCost.currency}/mo (${estimatedCost.hourly}/h) — ${estimatedCost.assumptions}. Use neo_estimate for a specific size.`);
+      const build = svcType === 'static_site' ? 'native nginx static hosting (not Railpack)' : 'built server-side';
+      log(`[dry-run] estimated cost (${svcType}, ${build}, default micro compute): ~${estimatedCost.monthly} ${estimatedCost.currency}/mo (${estimatedCost.hourly}/h) — ${estimatedCost.assumptions}. Use neo_estimate for a specific size.`);
     } catch { /* price book unavailable — skip the estimate, not the dry-run */ }
     return { dryRun: true, plan, service: svc, environment: targetEnv, serviceType: svcType, estimatedCost };
   }

package/src/mcp/tools.js

@@ -65,13 +65,17 @@ async function confirmCost(api, args, spec) {
   };
 }
 
-const SECRET_KEY = /(password|secret|secretkey|accesskey|connectionstring|connstr|dsn|token|privatekey|apikey)/i;
+const SECRET_KEY = /(password|secret|secretkey|accesskey|connectionstring|connstr|dsn|token|privatekey|apikey|authorization)/i;
+// Deployment snapshots (exact keys) embed rendered configs with plaintext creds — a
+// queue's `--pass`, a DB's POSTGRES_PASSWORD. Redact by EXACT key so we don't also
+// hit resourceId/source-of-truth-style names (substring match would catch "reSOURCEid").
+const SECRET_EXACT = new Set(['source', 'installed']);
 function redactSecrets(value) {
   if (Array.isArray(value)) return value.map(redactSecrets);
   if (value && typeof value === 'object') {
     const out = {};
     for (const [k, v] of Object.entries(value)) {
-      out[k] = SECRET_KEY.test(k) ? '[redacted — credentials are write-only; bind them to a consumer instead]' : redactSecrets(v);
+      out[k] = (SECRET_KEY.test(k) || SECRET_EXACT.has(k.toLowerCase())) ? '[redacted — credentials are write-only; bind them to a consumer instead]' : redactSecrets(v);
     }
     return out;
   }
@@ -120,8 +124,8 @@ export const TOOLS = [
         { type: 'template', create: true, deploy: true, scale: false, logs: true, variables: true, delete: true },
         { type: 'static_site', create: 'via_folder', deploy: true, scale: false, logs: true, variables: true, delete: true, nativeStatic: true, note: 'neo_deploy_folder serviceType=static_site with buildCommand/publishDirectory → native nginx static hosting (0.4.27); auto-detected for static-only folders' },
         { type: 'worker', create: 'via_folder', deploy: true, scale: true, logs: true, variables: true, delete: true, note: 'neo_deploy_folder serviceType=worker — no public ingress; repo auto-detection still TODO (handoff 6)' },
-        { type: 'database', create: true, get: true, list: true, update: true, backup: true, verify: true, publicAccess: true, delete: true, note: 'neo_create/list/get/update(resize)/delete_database + backup + verify (SQL round-trip probe) + enable/disable_db_public_access; restore still TODO (handoff 4.4)' },
-        { type: 'queue', create: true, get: true, list: true, update: true, verify: true, publicAccess: true, delete: true, note: 'neo_create/list/get/update/verify(publish→persist)/delete_queue + enable/disable_queue_public_access (handoff 4.5)' },
+        { type: 'database', create: true, deploy: true, get: true, list: true, update: true, backup: true, verify: true, publicAccess: true, delete: true, note: 'neo_create/deploy/list/get/update(resize)/delete_database + backup + verify (SQL round-trip probe) + enable/disable_db_public_access; restore still TODO (handoff 4.4)' },
+        { type: 'queue', create: true, deploy: true, get: true, list: true, update: true, verify: true, publicAccess: true, delete: true, note: 'neo_create/deploy/list/get/update/verify(publish→persist)/delete_queue + enable/disable_queue_public_access (handoff 4.5)' },
         { type: 'cron', create: true, get: true, list: true, run: true, runs: true, questionnaire: true, delete: true, note: 'neo_cron_questionnaire (guided) + create/list/get/run/list_runs/delete_cron (handoff 4.6)' },
         { type: 'object_storage', create: true, get: true, list: true, objects: true, upload: true, verify: true, delete: true, note: 'neo_create/list/get/verify(put→list→delete)/delete_bucket + list/upload/presign(get)/delete objects (handoff 4.7)' },
       ];
@@ -132,7 +136,7 @@ export const TOOLS = [
         resourceTypes,
         // Verbs this MCP build exposes today (no create-DB/queue/cron/bucket, no costed plan/apply yet).
         lifecycleVerbs: ['plan', 'apply', 'get_operation', 'wait_operation', 'delete_stack', 'reconcile_usage', 'service_usage', 'create', 'list', 'get', 'update', 'verify', 'enable_public_access', 'disable_public_access', 'deploy', 'scale', 'logs', 'get_variables', 'set_variable', 'estimate', 'scan_repo', 'bind', 'unbind', 'run_cron', 'cron_questionnaire', 'presign_object', 'backup', 'delete', 'delete_project', 'list_approvals', 'get_approval', 'get_credit', 'list_templates'],
-        bindings: { supported: true, targets: ['neo_db', 'neo_queue'], writeOnly: true, note: 'neo_bind_resource injects DATABASE_URL/NATS_URL server-side at deploy; the secret is never returned (handoff 5)' },
+        bindings: { supported: true, targets: ['neo_db', 'neo_queue', 'neo_object_storage'], writeOnly: true, note: 'neo_bind_resource + neo_plan_stack bindings inject DATABASE_URL / NATS_URL (+ NATS_HOST/PORT/USER/PASSWORD) / S3_* server-side at deploy; secrets never returned (handoff 5)' },
         sourceTypes: ['git', 'image', 'dockerfile', 'local', 'template'],
         environments: ['staging', 'production'],
         pricing,
@@ -152,6 +156,25 @@ export const TOOLS = [
       return (await api.get(`/api/v1/orgs/${orgId}/projects`)).data;
     },
   },
+  {
+    name: 'neo_create_project',
+    description: 'Create a new project in an organization — use it for a disposable project (e.g. isolated testing) or a fresh project to deploy into. orgId defaults to your primary org. Returns the new project (id, name).',
+    mutating: true,
+    schema: {
+      type: 'object',
+      properties: {
+        name: str('Project name'),
+        description: str('Project description (optional)'),
+        orgId: str('Organization id (optional; defaults to your primary org)'),
+      },
+      required: ['name'],
+    },
+    async call(api, args) {
+      const orgId = await api.resolveOrgId(args.orgId);
+      const { status, data } = await api.post(`/api/v1/orgs/${orgId}/projects`, { name: args.name, description: args.description || '' });
+      return result(status, data);
+    },
+  },
   {
     name: 'neo_get_project',
     description: 'Get one project by id.',
@@ -386,32 +409,45 @@ export const TOOLS = [
     async call(api, args) {
       const { data } = await api.post('/api/v1/repos/scan', { repoUrl: args.repoUrl, branch: args.branch, gitProviderId: args.gitProviderId });
       const subdirs = data?.subdirs || [];
-      const components = subdirs.map((s) => ({
-        path: s.path || '.',
-        name: s.name,
-        stack: s.type, // docker | node | go | python | java | php | ruby | rust | static
-        suggestedServiceType: s.type === 'static' ? 'static_site' : 'web',
-        suggestedBuildType: s.type === 'docker' ? 'dockerfile' : 'railpack',
-        contextDir: s.path || undefined,
-        detectedDependencies: s.deps || [], // database | queue | object_storage, inferred from the manifest
-        // Confidence + evidence (handoff 6): an explicit Dockerfile/index.html is high
-        // confidence; a language marker is inferred (medium). The stack marker + any
-        // detectedDependencies ARE the evidence.
-        typeConfidence: (s.type === 'docker' || s.type === 'static') ? 'high' : 'medium',
-        evidence: { marker: s.type, manifestDeps: s.deps || [] },
-      }));
+      const components = subdirs.map((s) => {
+        const role = s.role || 'service'; // service | worker | support
+        const support = role === 'support' || s.deployable === false;
+        return {
+          path: s.path || '.',
+          name: s.name,
+          stack: s.type, // docker | node | go | python | java | php | ruby | rust | static
+          role, // service | worker | support (library/config — not deployable)
+          deployable: !support,
+          // Don't suggest a service type for a support/library package; a worker-named
+          // root suggests worker; static → static_site; else web.
+          suggestedServiceType: support ? null : (role === 'worker' ? 'worker' : (s.type === 'static' ? 'static_site' : 'web')),
+          suggestedBuildType: s.type === 'docker' ? 'dockerfile' : 'railpack',
+          suggestedPort: s.port || undefined, // from the Dockerfile EXPOSE, when present
+          contextDir: s.path || undefined,
+          detectedDependencies: s.deps || [], // database | queue | object_storage, inferred from the manifest
+          // Confidence (handoff 6): a Dockerfile/index.html is high; a worker guess from
+          // the tree is low (confirm); a plain language marker is medium.
+          typeConfidence: support ? 'low' : (role === 'worker' ? 'low' : ((s.type === 'docker' || s.type === 'static') ? 'high' : 'medium')),
+          evidence: { marker: s.type, role, manifestDeps: s.deps || [] },
+        };
+      });
+      const deployable = components.filter((c) => c.deployable);
+      const support = components.filter((c) => !c.deployable);
       const anyDeps = components.some((c) => c.detectedDependencies.length);
       return {
         repoUrl: args.repoUrl,
         count: components.length,
+        deployableCount: deployable.length,
         components,
         note:
-          (components.length > 1
-            ? 'Monorepo: multiple deployable components. Ask the user which to deploy and create each selected one with its `contextDir` — do NOT collapse them into one service (handoff 6). Worker vs web cannot be inferred from the tree alone; confirm the type with the user.'
-            : components.length === 1
+          (deployable.length > 1
+            ? 'Monorepo: multiple deployable components. Ask the user which to deploy and create each selected one with its `contextDir` — do NOT collapse them into one service (handoff 6).'
+            : deployable.length === 1
               ? 'One deployable component found.'
-              : 'No deployable component found (no Dockerfile/package.json/go.mod/requirements.txt/index.html/… at any root).')
-          + (anyDeps ? ' A component lists detectedDependencies (database/queue/object_storage) from its manifest — consider planning those resources and binding them (neo_bind_resource); confirm with the user first.' : ''),
+              : 'No deployable component found.')
+          + (support.length ? ` ${support.length} support/library package(s) (role:support, deployable:false) were EXCLUDED from deployment — do not deploy config/lib packages (e.g. eslint/tsconfig/shared).` : '')
+          + (components.some((c) => c.role === 'worker') ? ' A component is guessed as a worker (low confidence) — confirm web vs worker with the user.' : ' Worker vs web is a guess; confirm the type with the user.')
+          + (anyDeps ? ' Some components list detectedDependencies (database/queue/object_storage) — consider planning + binding them (confirm first).' : ''),
       };
     },
   },
@@ -535,6 +571,16 @@ export const TOOLS = [
       return redactSecrets(result(status, data));
     },
   },
+  {
+    name: 'neo_deploy_database',
+    description: 'Deploy an individually-created managed database so it actually runs (provisions the cluster, sets its private host/port). Required after neo_create_database before the DB is reachable, bindable, or can have public access enabled. Poll neo_get_database until host is set and neo_verify_database passes. Credentials redacted.',
+    mutating: true,
+    schema: { type: 'object', properties: { databaseId: str('Database id (from neo_create_database)') }, required: ['databaseId'] },
+    async call(api, args) {
+      const { status, data } = await api.post(`/api/v1/databases/${args.databaseId}/deploy`);
+      return redactSecrets(result(status, data));
+    },
+  },
   {
     name: 'neo_list_databases',
     description: 'List managed databases in a project (credentials redacted).',
@@ -669,6 +715,16 @@ export const TOOLS = [
       return redactSecrets(result(status, data));
     },
   },
+  {
+    name: 'neo_deploy_queue',
+    description: 'Deploy an individually-created managed queue so it actually runs (provisions the NATS server, sets its private host/port). Required after neo_create_queue before the queue is reachable, bindable, or can have public access enabled. Poll neo_get_queue until host is set and neo_verify_queue passes. Credentials redacted.',
+    mutating: true,
+    schema: { type: 'object', properties: { queueId: str('Queue id (from neo_create_queue)') }, required: ['queueId'] },
+    async call(api, args) {
+      const { status, data } = await api.post(`/api/v1/queues/${args.queueId}/deploy`);
+      return redactSecrets(result(status, data));
+    },
+  },
   {
     name: 'neo_list_queues',
     description: 'List managed queues in a project (credentials redacted).',
@@ -762,12 +818,15 @@ export const TOOLS = [
         url: str('Target URL (mode=http_endpoint)'),
         method: str('HTTP method (mode=http_endpoint), e.g. GET/POST'),
         environment: { type: 'string', enum: ['staging', 'production'], description: 'REQUIRED — staging or production (never defaulted, handoff §2)' },
+        confirm: { type: 'boolean', description: 'Approve & Create: without confirm:true the tool returns the cost (crons are billed per run — variable) and creates nothing. Re-call with confirm:true to create.' },
       },
       required: ['projectId', 'name', 'mode', 'scheduleType', 'environment'],
     },
     async call(api, args) {
       requireEnv(args.environment);
-      const { projectId, ...body } = args;
+      const gate = await confirmCost(api, args, {}); // cron cost is variable (per-run) — gate surfaces the rate
+      if (gate) return gate;
+      const { projectId, confirm, orgId, ...body } = args;
       const { status, data } = await api.post(`/api/v1/projects/${projectId}/crons`, body);
       return redactSecrets(result(status, data));
     },
@@ -821,11 +880,14 @@ export const TOOLS = [
         region: str('Region (optional; see neo_list_regions on the portal)'),
         acl: { type: 'string', description: 'private | public-read (optional, default private)' },
         quotaGB: int('Storage quota in GB (optional)'),
+        confirm: { type: 'boolean', description: 'Approve & Create: without confirm:true the tool returns the cost and creates nothing. Re-call with confirm:true to actually create.' },
       },
       required: ['projectId', 'name'],
     },
     async call(api, args) {
-      const { projectId, ...body } = args;
+      const gate = await confirmCost(api, args, { objectStorageGB: gbFromSize(args.quotaGB) });
+      if (gate) return gate;
+      const { projectId, confirm, orgId, ...body } = args;
       const { status, data } = await api.post(`/api/v1/projects/${projectId}/buckets`, body);
       return redactSecrets(result(status, data));
     },
@@ -952,7 +1014,7 @@ export const TOOLS = [
   {
     name: 'neo_plan_stack',
     description:
-      'Create an immutable, COSTED plan for a whole stack (services + databases/queues/buckets + bindings) WITHOUT creating anything — zero-write (handoff 3.3). Returns planId, planHash, itemized monthly/hourly cost, and ordered phases. Show the cost to the user for approval, then call neo_apply_stack with planId+planHash. The plan expires in 15 minutes.',
+      'Create an immutable, COSTED plan for a whole stack (services + databases/queues/buckets + scheduled jobs + bindings) WITHOUT creating anything — zero-write (handoff 3.3). Supports kind: app|database|queue|bucket|cron and bindings to neo_db|neo_queue|neo_object_storage. Returns planId, planHash, itemized monthly/hourly cost, and ordered phases. Show the cost to the user for approval, then call neo_apply_stack with planId+planHash. The plan expires in 15 minutes.',
     mutating: false,
     schema: {
       type: 'object',
@@ -961,16 +1023,16 @@ export const TOOLS = [
         environment: { type: 'string', enum: ['staging', 'production'], description: 'REQUIRED — staging or production (never defaulted, handoff §2)' },
         resources: {
           type: 'array',
-          description: 'The stack resources. Each needs a unique name + kind (app | database | queue | bucket).',
+          description: 'The stack resources. Each needs a unique name + kind (app | database | queue | bucket | cron).',
           items: {
             type: 'object',
             properties: {
-              kind: { type: 'string', enum: ['app', 'database', 'queue', 'bucket'] },
+              kind: { type: 'string', enum: ['app', 'database', 'queue', 'bucket', 'cron'] },
               name: str('Unique resource name within this stack (bindings reference it)'),
               serviceType: str('app: web | worker | static_site'),
               buildCommand: str('app/static_site: build command (e.g. "npm ci && npm run build")'),
               publishDirectory: str('static_site: built-files directory to serve (e.g. "dist")'),
-              image: str('app: prebuilt image reference'),
+              image: str('app/cron: prebuilt image reference'),
               repoUrl: str('app: git repository URL'),
               branch: str('app: git branch'),
               port: int('app: container port'),
@@ -980,20 +1042,29 @@ export const TOOLS = [
               volumeSize: str('database: storage size, e.g. 10Gi'),
               quotaGB: int('bucket: storage quota GB'),
               region: str('bucket: region'),
+              mode: str('cron: app_command | http_endpoint'),
+              scheduleType: str('cron: cron | interval | once | seconds'),
+              schedule: str('cron: cron expression (scheduleType=cron)'),
+              intervalMinutes: int('cron: interval in minutes (scheduleType=interval)'),
+              timezone: str('cron: IANA timezone (optional)'),
+              serviceId: str('cron app_command: target service — another resource NAME in this stack, or a literal service id'),
+              command: { type: 'array', items: { type: 'string' }, description: 'cron app_command: command argv' },
+              url: str('cron http_endpoint: target URL'),
+              method: str('cron http_endpoint: HTTP method'),
             },
             required: ['kind', 'name'],
           },
         },
         bindings: {
           type: 'array',
-          description: 'Wire a database/queue into a consumer app (injected as an env var at deploy, server-side).',
+          description: 'Wire a database/queue/bucket into a consumer app (injected as env var(s) at deploy, server-side).',
           items: {
             type: 'object',
             properties: {
               consumer: str('The consumer app resource name'),
-              targetType: { type: 'string', enum: ['neo_db', 'neo_queue'] },
-              target: str('The database/queue resource name'),
-              envKey: str('Env var name (optional; default DATABASE_URL / NATS_URL)'),
+              targetType: { type: 'string', enum: ['neo_db', 'neo_queue', 'neo_object_storage'] },
+              target: str('The database/queue/bucket resource name'),
+              envKey: str('Env var name/prefix (optional; default DATABASE_URL / NATS_URL / S3)'),
             },
             required: ['consumer', 'targetType', 'target'],
           },
@@ -1179,9 +1250,9 @@ export const TOOLS = [
       type: 'object',
       properties: {
         databaseId: str('Database id (postgres, already deployed)'),
-        allowlistCidrs: { type: 'array', items: { type: 'string' }, description: 'CIDR allowlist, e.g. ["203.0.113.0/24"] (optional; empty = allow any source IP)' },
+        allowlistCidrs: { type: 'array', items: { type: 'string' }, description: 'REQUIRED — at least one real source CIDR, e.g. ["203.0.113.0/24"]. The server rejects an empty list and 0.0.0.0/0 (no open-to-the-world).' },
       },
-      required: ['databaseId'],
+      required: ['databaseId', 'allowlistCidrs'],
     },
     async call(api, args) {
       const { status, data } = await api.post(`/api/v1/databases/${args.databaseId}/public-access`, { allowlistCidrs: args.allowlistCidrs || [] });
@@ -1206,9 +1277,9 @@ export const TOOLS = [
       type: 'object',
       properties: {
         queueId: str('Queue id (already deployed)'),
-        allowlistCidrs: { type: 'array', items: { type: 'string' }, description: 'CIDR allowlist (optional; empty = allow any source IP)' },
+        allowlistCidrs: { type: 'array', items: { type: 'string' }, description: 'REQUIRED — at least one real source CIDR, e.g. ["203.0.113.0/24"]. The server rejects an empty list and 0.0.0.0/0.' },
       },
-      required: ['queueId'],
+      required: ['queueId', 'allowlistCidrs'],
     },
     async call(api, args) {
       const { status, data } = await api.post(`/api/v1/queues/${args.queueId}/public-access`, { allowlistCidrs: args.allowlistCidrs || [] });
@@ -1227,23 +1298,63 @@ export const TOOLS = [
   },
   {
     name: 'neo_delete_project',
-    description: 'Permanently delete a project and ALL its resources (apps, databases, queues, crons, buckets, and the project namespace with its PVCs/CNPG clusters). Destructive and irreversible — nothing is recoverable. Requires confirm:true. Only the project creator or an org owner/admin may delete it.',
+    description: 'Delete a project and ALL its resources (apps, databases, queues, crons, buckets, namespace + PVCs/CNPG). SAFE BY DEFAULT: without confirm:true it returns a PREVIEW (project name, org, full resource inventory, accrued-usage snapshot, no-refund warning) and deletes NOTHING. A NON-EMPTY project additionally requires cascade:true. Destructive and irreversible. Only the creator or an org owner/admin may delete.',
     mutating: true,
     destructive: true,
     schema: {
       type: 'object',
       properties: {
         projectId: str('Project id'),
-        confirm: { type: 'boolean', description: 'Must be true to proceed — guards against accidental deletion of an entire project.' },
+        confirm: { type: 'boolean', description: 'Must be true to delete. Without it you get a preview only (nothing is deleted).' },
+        cascade: { type: 'boolean', description: 'Required true to delete a NON-EMPTY project — acknowledges every resource in the inventory is destroyed.' },
       },
-      required: ['projectId', 'confirm'],
+      required: ['projectId'],
     },
     async call(api, args) {
+      const pid = args.projectId;
+      // Gather inventory + usage BEFORE any delete (this is also the metering snapshot).
+      const safeGet = async (p) => { try { return (await api.get(p)).data; } catch { return null; } };
+      const [proj, apps, dbs, queues, crons, buckets, usage] = await Promise.all([
+        safeGet(`/api/v1/projects/${pid}`),
+        safeGet(`/api/v1/projects/${pid}/apps`),
+        safeGet(`/api/v1/projects/${pid}/databases`),
+        safeGet(`/api/v1/projects/${pid}/queues`),
+        safeGet(`/api/v1/projects/${pid}/crons`),
+        safeGet(`/api/v1/projects/${pid}/buckets`),
+        safeGet(`/api/v1/projects/${pid}/usage`),
+      ]);
+      const arr = (x, k) => (Array.isArray(x) ? x : (x && Array.isArray(x[k]) ? x[k] : []));
+      const inv = {
+        services: arr(apps, 'applications').map((a) => a.name || a.id), // list endpoint wraps as {applications:[…]}
+        databases: arr(dbs, 'databases').map((d) => d.name || d.id),
+        queues: arr(queues, 'queues').map((q) => q.name || q.id),
+        crons: arr(crons, 'crons').map((c) => c.name || c.id),
+        buckets: arr(buckets, 'buckets').map((b) => b.name || b.id),
+      };
+      const total = Object.values(inv).reduce((n, a) => n + a.length, 0);
+      // Fail-safe: if any inventory fetch FAILED (null, not empty), we can't prove the
+      // project is empty — treat it as non-empty so the empty-path can't silently
+      // delete hidden resources (the preview must be trustworthy).
+      const inventoryIncomplete = [apps, dbs, queues, crons, buckets].some((x) => x === null);
+      const preview = {
+        project: proj ? { id: proj.id, name: proj.name, organizationId: proj.organizationId } : { id: pid },
+        resourceInventory: inv,
+        resourceCount: total,
+        meteringSnapshot: usage ? { period: usage.period, total: usage.total ?? usage.totalCost, currency: usage.currency } : null,
+        inventoryIncomplete: inventoryIncomplete || undefined,
+        warning: 'IRREVERSIBLE: deletes the project, every resource above, and their data (database/queue volumes included). No refund for prepaid or accrued usage.',
+      };
+      // Treat an unverifiable inventory as non-empty — never allow the no-cascade path
+      // when we could not confirm the project is actually empty.
+      const requireCascade = total > 0 || inventoryIncomplete;
       if (args.confirm !== true) {
-        return { error: 'refused', message: 'Deleting a project removes ALL its resources and is irreversible. Re-call with confirm:true to proceed.' };
+        return { ...preview, deleted: false, requiresConfirmation: true, message: requireCascade ? 'Show this inventory to the user. To delete, re-call with confirm:true AND cascade:true.' : 'Empty project. To delete, re-call with confirm:true.' };
       }
-      const { status, data } = await api.del(`/api/v1/projects/${args.projectId}`);
-      return result(status, data);
+      if (requireCascade && args.cascade !== true) {
+        return { ...preview, deleted: false, error: 'cascade_required', message: inventoryIncomplete ? 'Could not fully verify the project inventory — re-call with confirm:true AND cascade:true to delete anyway.' : `This project has ${total} resource(s). Re-call with confirm:true AND cascade:true to delete them all.` };
+      }
+      const { status, data } = await api.del(`/api/v1/projects/${pid}`);
+      return { deleted: true, project: preview.project, removed: inv, resourceCount: total, meteringSnapshot: preview.meteringSnapshot, result: result(status, data) };
     },
   },
 ];