@biznetgio/neo-app 0.4.31 → 0.4.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biznetgio/neo-app",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "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

@@ -6,8 +6,23 @@ import { basename, join } from 'node:path';
 import { existsSync, readFileSync, readdirSync, writeFileSync, rmSync } from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { tmpdir } from 'node:os';
+import { createHash } from 'node:crypto';
 import { estimateCost } from './pricing.js';
 
+// deployToken binds a dry-run to its real deploy: a short hash of the resolved spec
+// that actually deploys. The dry-run returns it; the real call, if given confirmToken,
+// recomputes and refuses a mismatch — so the agent can't show one cost then deploy
+// a different spec (handoff 3.3/3.4; 0.4.31 retest §5).
+function deployToken({ svc, targetEnv, svcType, port, buildCommand, publishDirectory, src }) {
+  const canon = JSON.stringify({
+    svc, targetEnv, svcType,
+    port: port || null, buildCommand: buildCommand || null, publishDirectory: publishDirectory || null,
+    src: { mode: src.mode, image: src.image || null, repo: src.repo || null, branch: src.branch || null,
+      dir: src.dir ? basename(src.dir) : null, zip: src.zipFile ? basename(src.zipFile) : null },
+  });
+  return createHash('sha256').update(canon).digest('hex').slice(0, 16);
+}
+
 export function sanitizeName(s) {
   return (
     String(s).toLowerCase().replace(/[^a-z0-9-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 60) || 'app'
@@ -140,7 +155,7 @@ function looksStatic(dir) {
 // With `dryRun`, it performs NO create/update/upload/deploy — only the GETs needed to
 // build a plan — and returns { dryRun:true, plan } (JNG #93).
 // Returns { pending, approvalId } or { appId, url, result }. `log(msg)` is optional.
-export async function deploySource(api, { projectId, src, name, port, build, serviceType, buildCommand, publishDirectory, environment, dryRun = false, timeout = 300, log = () => {} }) {
+export async function deploySource(api, { projectId, src, name, port, build, serviceType, buildCommand, publishDirectory, environment, confirmToken, dryRun = false, timeout = 300, log = () => {} }) {
   const defaultName =
     src.mode === 'image' ? src.image.split('/').pop().split(':')[0]
     : src.mode === 'git' ? basename(src.repo, '.git')
@@ -276,7 +291,16 @@ export async function deploySource(api, { projectId, src, name, port, build, ser
       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 };
+    return { dryRun: true, plan, service: svc, environment: targetEnv, serviceType: svcType, estimatedCost, confirmToken: deployToken({ svc, targetEnv, svcType, port, buildCommand, publishDirectory, src }) };
+  }
+
+  // Crypto link: if the caller passed the dry-run's confirmToken, the spec about to
+  // deploy must still hash to it — otherwise the cost/spec the user approved changed.
+  if (confirmToken) {
+    const now = deployToken({ svc, targetEnv, svcType, port, buildCommand, publishDirectory, src });
+    if (now !== confirmToken) {
+      throw new Error(`deploy spec changed since the dry-run (confirmToken ${confirmToken} → ${now}) — re-run with dryRun:true, show the new cost, and confirm again`);
+    }
   }
 
   if (src.mode === 'dir' || src.mode === 'zip') {

package/src/mcp/tools.js

@@ -4,6 +4,7 @@
 
 import { resolve, basename } from 'node:path';
 import { statSync, readFileSync } from 'node:fs';
+import { createHash } from 'node:crypto';
 import { deploySource } from '../deploySource.js';
 import { pkgVersion } from '../util.js';
 import { estimateCost } from '../pricing.js';
@@ -46,6 +47,15 @@ function gbFromSize(v) {
   return m ? parseInt(m[1], 10) : undefined;
 }
 
+// deletionHashOf is an immutable approval token for a project deletion: a short hash
+// of the exact inventory being deleted. The preview returns it; a cascade delete must
+// echo it back, and the tool recomputes the live inventory and refuses a mismatch — so
+// a project can't be deleted against a stale/partial inventory (0.4.31 retest §7).
+function deletionHashOf(pid, inv, total) {
+  const names = Object.entries(inv).flatMap(([k, a]) => a.map((n) => k + ':' + n)).sort();
+  return createHash('sha256').update(JSON.stringify({ pid, total, names })).digest('hex').slice(0, 16);
+}
+
 // confirmCost is the Approve & Create gate for billable one-shot creates: unless
 // args.confirm===true it returns the live-priced cost and creates NOTHING — the
 // agent shows the user, then re-calls with confirm:true. plan/apply remains the
@@ -65,13 +75,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,7 +134,7 @@ 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, 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: 'database', create: true, deploy: true, get: true, list: true, update: true, backup: true, restore: true, verify: true, publicAccess: true, delete: true, note: 'neo_create/deploy/list/get/update(resize)/delete_database + backup + restore (postgres, local backups) + verify (SQL round-trip) + enable/disable_db_public_access (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)' },
@@ -131,7 +145,7 @@ export const TOOLS = [
         controlPlane,
         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'],
+        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', 'restore', 'delete', 'delete_project', 'list_approvals', 'get_approval', 'get_credit', 'list_templates'],
         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'],
@@ -152,6 +166,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.',
@@ -399,6 +432,7 @@ export const TOOLS = [
           // 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
@@ -467,7 +501,8 @@ export const TOOLS = [
         publishDirectory: str('static_site: directory of built files to serve via nginx (e.g. "dist"); enables native static hosting'),
         port: int('Container port (optional; ignored for worker)'),
         environment: { type: 'string', enum: ['staging', 'production'], description: 'REQUIRED — staging or production. Never defaulted (handoff §2). Deploy to staging first.' },
-        dryRun: { type: 'boolean', description: 'Preview the plan without creating/uploading/deploying anything (JNG #93)' },
+        dryRun: { type: 'boolean', description: 'Preview the plan without creating/uploading/deploying anything (JNG #93). Returns a confirmToken.' },
+        confirmToken: str('The confirmToken from a prior dryRun — pass it on the real deploy to guarantee the spec/cost the user approved has not changed (rejected on mismatch).'),
       },
       required: ['projectId', 'path', 'environment'],
     },
@@ -492,9 +527,10 @@ export const TOOLS = [
         publishDirectory: args.publishDirectory,
         port: args.port,
         environment,
+        confirmToken: args.confirmToken,
         dryRun: !!args.dryRun,
       });
-      if (r.dryRun) return { status: 'dry_run', plan: r.plan, service: r.service, environment: r.environment, estimatedCost: r.estimatedCost };
+      if (r.dryRun) return { status: 'dry_run', plan: r.plan, service: r.service, environment: r.environment, estimatedCost: r.estimatedCost, confirmToken: r.confirmToken, note: 'To deploy exactly this, re-call without dryRun and pass this confirmToken.' };
       if (r.pending) return { status: 'pending_approval', approvalId: r.approvalId };
       return { status: r.result, url: r.url || undefined, appId: r.appId };
     },
@@ -606,6 +642,26 @@ export const TOOLS = [
       return result(status, data);
     },
   },
+  {
+    name: 'neo_restore_database',
+    description: 'Restore a postgres database from a prior backup (handoff 4.4). DESTRUCTIVE — applies the backup dump into the LIVE database (overwrites/merges) and is irreversible, so it requires confirm:true. Pass backupId for a specific backup, else the latest successful one is used. Local-destination backups only for now.',
+    mutating: true,
+    destructive: true,
+    schema: {
+      type: 'object',
+      properties: {
+        databaseId: str('Database id (postgres)'),
+        backupId: str('Backup id to restore from (optional; default the latest successful backup)'),
+        confirm: { type: 'boolean', description: 'Must be true — restore overwrites data in the live database.' },
+      },
+      required: ['databaseId', 'confirm'],
+    },
+    async call(api, args) {
+      const { databaseId, ...body } = args;
+      const { status, data } = await api.post(`/api/v1/databases/${databaseId}/restore`, body);
+      return result(status, data);
+    },
+  },
   {
     name: 'neo_verify_queue',
     description: 'Functionally verify a managed queue (handoff §8): runs an in-cluster probe that connects to NATS JetStream, publishes a message to a temporary stream, and confirms it was persisted — a real publish→persist round-trip, returning {verified, log} WITHOUT handing you any credentials. The queue must be deployed. Synchronous (~90s).',
@@ -1283,6 +1339,7 @@ export const TOOLS = [
         projectId: str('Project id'),
         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.' },
+        deletionHash: str('For a non-empty project: the deletionHash from the preview. The tool refuses if the live inventory no longer matches it (immutable approval).'),
       },
       required: ['projectId'],
     },
@@ -1301,25 +1358,44 @@ export const TOOLS = [
       ]);
       const arr = (x, k) => (Array.isArray(x) ? x : (x && Array.isArray(x[k]) ? x[k] : []));
       const inv = {
-        services: arr(apps, 'apps').map((a) => a.name || a.id),
+        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,
+        deletionHash: deletionHashOf(pid, inv, total),
         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 { ...preview, deleted: false, requiresConfirmation: true, message: total > 0 ? '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.' };
+        return { ...preview, deleted: false, requiresConfirmation: true, message: requireCascade ? 'Show this inventory to the user. To delete, re-call with confirm:true, cascade:true, and deletionHash.' : 'Empty project. To delete, re-call with confirm:true.' };
+      }
+      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.` };
       }
-      if (total > 0 && args.cascade !== true) {
-        return { ...preview, deleted: false, error: 'cascade_required', message: `This project has ${total} resource(s). Re-call with confirm:true AND cascade:true to delete them all.` };
+      // Immutable approval: a non-empty cascade delete must echo the preview's
+      // deletionHash, and it must still match the live inventory.
+      if (total > 0) {
+        if (!args.deletionHash) {
+          return { ...preview, deleted: false, error: 'deletion_hash_required', message: 'Pass deletionHash (from the preview) to confirm you are deleting exactly this inventory.' };
+        }
+        if (args.deletionHash !== preview.deletionHash) {
+          return { ...preview, deleted: false, error: 'inventory_changed', message: 'The project inventory changed since your preview — re-preview and pass the new deletionHash.' };
+        }
       }
       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) };