@biznetgio/neo-app 0.4.26 → 0.4.28

package/package.json

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

@@ -140,7 +140,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, environment, dryRun = false, timeout = 300, log = () => {} }) {
+export async function deploySource(api, { projectId, src, name, port, build, serviceType, buildCommand, publishDirectory, environment, dryRun = false, timeout = 300, log = () => {} }) {
   const defaultName =
     src.mode === 'image' ? src.image.split('/').pop().split(':')[0]
     : src.mode === 'git' ? basename(src.repo, '.git')
@@ -220,6 +220,9 @@ export async function deploySource(api, { projectId, src, name, port, build, ser
         // A worker has no public listener: don't request a port or TLS/ingress.
         port: isWorker ? undefined : (port ? Number(port) : undefined),
         tls: isWorker ? false : true,
+        // static_site native hosting: build + serve a published directory (§4.3).
+        buildCommand: svcType === 'static_site' ? (buildCommand || undefined) : undefined,
+        publishDirectory: svcType === 'static_site' ? (publishDirectory || undefined) : undefined,
       });
       if (pending(res)) return { pending: true, approvalId: res.data.approvalId };
       app = res.data?.application || res.data;

package/src/mcp/tools.js

@@ -92,9 +92,9 @@ export const TOOLS = [
       const resourceTypes = [
         { type: 'web', create: true, deploy: true, scale: true, logs: true, variables: true, delete: true },
         { 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, note: 'neo_deploy_folder serviceType=static_site (auto-detected for static-only folders); auto-detection from a repo/monorepo is still TODO (handoff 6)' },
+        { 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, delete: true, note: 'neo_create/list/get/update(resize)/delete_database + backup (list/create/run); restore still TODO (handoff 4.4)' },
+        { type: 'database', create: true, get: true, list: true, update: true, backup: true, verify: true, delete: true, note: 'neo_create/list/get/update(resize)/delete_database + backup + verify (SQL round-trip probe); restore still TODO (handoff 4.4)' },
         { type: 'queue', create: true, get: true, list: true, update: true, delete: true, note: 'neo_create/list/get/update/delete_queue (0.4.15-0.4.25) (handoff 4.5)' },
         { type: 'cron', create: true, get: true, list: true, run: true, runs: true, delete: true, note: 'neo_create/list/get/run/list_runs/delete_cron (0.4.15-0.4.21) (handoff 4.6)' },
         { type: 'object_storage', create: true, get: true, list: true, objects: true, upload: true, delete: true, note: 'neo_create/list/get/delete_bucket + list/upload/presign(get)/delete objects (0.4.15-0.4.25) (handoff 4.7)' },
@@ -105,7 +105,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', 'create', 'list', 'get', 'update', 'deploy', 'scale', 'logs', 'get_variables', 'set_variable', 'estimate', 'scan_repo', 'bind', 'unbind', 'run_cron', 'presign_object', 'backup', 'delete', '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', 'deploy', 'scale', 'logs', 'get_variables', 'set_variable', 'estimate', 'scan_repo', 'bind', 'unbind', 'run_cron', 'presign_object', 'backup', 'delete', '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)' },
         sourceTypes: ['git', 'image', 'dockerfile', 'local', 'template'],
         environments: ['staging', 'production'],
@@ -293,6 +293,25 @@ export const TOOLS = [
       return (await api.get(`/api/v1/orgs/${orgId}/credit`)).data;
     },
   },
+  {
+    name: 'neo_service_usage',
+    description: 'Get the metered usage + cost attributed to ONE service/resource in a project — per-service usage attribution (handoff §4). Filters the project usage breakdown to this resourceId.',
+    mutating: false,
+    schema: { type: 'object', properties: { projectId: str('Project id'), resourceId: str('Service/database/queue/bucket id (from neo_list_services/databases/…)') }, required: ['projectId', 'resourceId'] },
+    async call(api, args) {
+      const u = (await api.get(`/api/v1/projects/${args.projectId}/usage`)).data || {};
+      const lines = (u.lines || []).filter((l) => l.resourceId === args.resourceId);
+      const totalCost = Math.round(lines.reduce((sum, l) => sum + (l.cost || 0), 0));
+      return {
+        resourceId: args.resourceId,
+        period: u.period,
+        currency: u.currency,
+        lines,
+        totalCost,
+        note: lines.length ? undefined : 'no metered usage attributed to this resource yet (usage accrues hourly)',
+      };
+    },
+  },
   {
     name: 'neo_estimate',
     description:
@@ -406,6 +425,8 @@ export const TOOLS = [
         path: str('Local folder or .zip path'),
         name: str('Service name (optional)'),
         serviceType: { type: 'string', enum: ['web', 'worker', 'static_site'], description: 'web (default) | worker (no public URL) | static_site. Auto-detects static_site for a static-only folder; else web.' },
+        buildCommand: str('static_site: build command to run before serving (e.g. "npm ci && npm run build"); omit for a pre-built folder'),
+        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)' },
@@ -429,6 +450,8 @@ export const TOOLS = [
         src,
         name: args.name,
         serviceType: args.serviceType,
+        buildCommand: args.buildCommand,
+        publishDirectory: args.publishDirectory,
         port: args.port,
         environment,
         dryRun: !!args.dryRun,
@@ -522,6 +545,16 @@ export const TOOLS = [
       return redactSecrets(result(status, data));
     },
   },
+  {
+    name: 'neo_verify_database',
+    description: 'Functionally verify a managed database (handoff §8.1): runs an in-cluster probe that opens the DB and does a SQL round-trip (SELECT 1), returning {verified, log} — WITHOUT handing you any credentials. Postgres only for now. Synchronous (waits up to ~60s for the probe).',
+    mutating: true,
+    schema: { type: 'object', properties: { databaseId: str('Database id (postgres)') }, required: ['databaseId'] },
+    async call(api, args) {
+      const { status, data } = await api.post(`/api/v1/databases/${args.databaseId}/verify`);
+      return result(status, data);
+    },
+  },
   {
     name: 'neo_list_backups',
     description: 'List configured database backups in a project (handoff 4.4): schedule, destination, last run status.',
@@ -849,6 +882,8 @@ export const TOOLS = [
               kind: { type: 'string', enum: ['app', 'database', 'queue', 'bucket'] },
               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'),
               repoUrl: str('app: git repository URL'),
               branch: str('app: git branch'),
@@ -968,6 +1003,16 @@ export const TOOLS = [
       const plan = (await api.get(`/api/v1/plans/${args.planId}`)).data;
       let usage = null;
       try { usage = (await api.get(`/api/v1/projects/${plan.projectId}/usage`)).data; } catch { /* usage may be unavailable */ }
+      // Per-resource actuals: attribute the project usage lines to this plan's resources.
+      const planIds = new Set(Object.values(plan.result || {}).map((v) => v && v.id).filter(Boolean));
+      const perResource = {};
+      for (const l of (usage?.lines || [])) {
+        if (!planIds.has(l.resourceId)) continue;
+        const r = perResource[l.resourceId] || { resourceName: l.resourceName, resourceType: l.resourceType, cost: 0 };
+        r.cost += l.cost || 0;
+        perResource[l.resourceId] = r;
+      }
+      const actualForPlan = Math.round(Object.values(perResource).reduce((s, r) => s + r.cost, 0));
       return {
         planId: args.planId,
         projectId: plan.projectId,
@@ -975,8 +1020,10 @@ export const TOOLS = [
         currency: plan.cost?.currency,
         priceBook: plan.cost?.priceBook,
         variableSkus: plan.cost?.variable || [],
-        actualUsage: redactSecrets(usage),
-        note: 'estimatedMonthly is the FIXED compute/storage estimate; actualUsage is metered (incl. variable usage). Compare over a full billing period — a just-applied stack has not accrued usage yet.',
+        actualForPlanResources: actualForPlan,
+        perResource,
+        projectUsageTotal: usage?.totalCost,
+        note: 'estimatedMonthly is the FIXED monthly compute/storage estimate; actualForPlanResources sums the metered cost of THIS plan\'s resources so far (accrues hourly — ~0 just after apply). perResource breaks it down.',
       };
     },
   },