@celsian/vura-cli 0.5.4 → 0.5.6

package/dist/commands/dev.js

@@ -14,7 +14,7 @@
  */
 import { renderToString as builtinRenderToString } from 'what-framework/server';
 import { importRouteModule } from './shared.js';
-import { buildManifest, compilePageRoutes, matchPageRoute, compileRoutes, matchApiPath, getLogger, wrapDocument, escapeHtml, parseNodeBody, reportError, getMimeType, createApiApp, createWsUpgradeHandler, createNoServerWebSocketServer, GLOBAL_HOOKS_FILENAMES, nodeToWebRequest, writeWebResponse, generateClientPageEntry, } from '@celsian/vura-core';
+import { buildManifest, compilePageRoutes, matchPageRoute, compileRoutes, matchApiPath, getLogger, wrapDocument, escapeHtml, parseNodeBody, reportError, getMimeType, runTaskOnce, buildTaskEnvelope, createApiApp, createWsUpgradeHandler, createNoServerWebSocketServer, GLOBAL_HOOKS_FILENAMES, nodeToWebRequest, writeWebResponse, generateClientPageEntry, } from '@celsian/vura-core';
 export function parseDevOptions(args, projectRoot = process.cwd()) {
     const portArg = args.find((_, i) => args[i - 1] === '--port');
     const hostArg = args.find((_, i) => args[i - 1] === '--host');
@@ -375,14 +375,74 @@ export async function startStandaloneServer(manifest, opts) {
             }
             try {
                 const mod = await loadHandler(taskRoute.filePath);
+                if (typeof mod.POST !== 'function') {
+                    res.writeHead(400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ error: 'Task must export POST handler' }));
+                    return;
+                }
                 const body = await parseNodeBody(req);
-                const result = await mod.POST({
-                    taskId: String(Date.now()),
-                    input: body?.input,
-                    attempt: 1,
+                // Accept both `{ input: ... }` (legacy admin convention + the platform's
+                // `{ taskId, input, attempt, runId?, steps? }` wrapper) and a raw payload
+                // posted directly as the body (enqueue()'s local fallback).
+                const isWrapper = body && typeof body === 'object' && 'input' in body;
+                const input = isWrapper ? body.input : body;
+                // Platform cron/synthetic dispatches (X-Vura-Cron: true) skip input
+                // validation, mirroring the standalone server + in-process cron.
+                const isCronDispatch = String(req.headers['x-vura-cron'] ?? '').toLowerCase() === 'true';
+                const isPlatformDispatch = String(req.headers['x-vura-task-id'] ?? '') !== '';
+                // Dispatch body v2 (Phase 2): tolerate-absent runId + steps.
+                const runId = isWrapper && typeof body.runId === 'string'
+                    ? body.runId
+                    : undefined;
+                const dispatchSteps = isWrapper && body.steps && typeof body.steps === 'object'
+                    ? body.steps
+                    : {};
+                // Off-platform child dispatcher so `step.waitForTask` resolves the child
+                // in-process during `vura dev` (no durable platform → waits run locally).
+                const localChildDispatch = async (childName, childPayload) => {
+                    const childRoute = manifest.api.find((r) => r.kind === 'task' &&
+                        r.urlPattern.replace(/^\/api\//, '').replace(/\//g, '.') === childName);
+                    if (!childRoute)
+                        return { ok: false, error: `Task not found: ${childName}` };
+                    const childMod = await loadHandlerCached(childRoute.filePath);
+                    if (typeof childMod.POST !== 'function')
+                        return { ok: false, error: 'Task must export POST handler' };
+                    const childRes = await runTaskOnce({
+                        name: childName,
+                        config: {
+                            retries: typeof childRoute.config.retries === 'number' ? childRoute.config.retries : 0,
+                            timeout: typeof childRoute.config.timeout === 'number' ? childRoute.config.timeout : 30_000,
+                        },
+                        handler: childMod.POST,
+                    }, { input: childPayload, hasPlatform: false, localChildDispatch });
+                    return childRes.status === 'completed'
+                        ? { ok: true, result: childRes.result }
+                        : { ok: false, error: childRes.error };
+                };
+                const runResult = await runTaskOnce({
+                    name: taskName,
+                    config: {
+                        retries: typeof taskRoute.config.retries === 'number' ? taskRoute.config.retries : 0,
+                        timeout: typeof taskRoute.config.timeout === 'number' ? taskRoute.config.timeout : 30_000,
+                    },
+                    handler: mod.POST,
+                    inputSchema: isCronDispatch ? undefined : mod.input,
+                }, {
+                    input,
+                    runId,
+                    steps: dispatchSteps,
+                    hasPlatform: isPlatformDispatch ? true : undefined,
+                    localChildDispatch,
                 });
+                if (runResult.validationError) {
+                    res.writeHead(runResult.validationError.statusCode, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify(runResult.validationError.body));
+                    return;
+                }
+                // Additive envelope + legacy status/result for backward compatibility.
+                const envelope = buildTaskEnvelope(taskName, runResult);
                 res.writeHead(200, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ status: 'completed', result }));
+                res.end(JSON.stringify({ ...envelope, status: runResult.status, ...(runResult.error !== undefined ? { error: runResult.error } : {}) }));
             }
             catch (err) {
                 reportError(err instanceof Error ? err : new Error(String(err.message)), { method, path: url.pathname, requestId: reqCtx.requestId }, logger);

package/dist/commands/tasks.js

@@ -10,7 +10,7 @@
  * process.exit() directly. This lets vitest keep running while still signalling
  * the right exit code to the shell via the CLI entry point.
  */
-import { buildManifest, runTaskOnce } from '@celsian/vura-core';
+import { buildManifest, runTaskOnce, buildTaskEnvelope } from '@celsian/vura-core';
 import { importRouteModule } from './shared.js';
 // ─── Name helpers ────────────────────────────────────────────────────────────
 /**
@@ -75,6 +75,27 @@ async function runTask(projectRoot, taskName, rawInput) {
         process.exitCode = 1;
         return;
     }
+    // Off-platform child dispatcher so `step.waitForTask` resolves the child
+    // in-process when running a task from the CLI (no durable platform).
+    const localChildDispatch = async (childName, childPayload) => {
+        const childRoute = taskRoutes.find((r) => taskNameFromPattern(r.urlPattern) === childName);
+        if (!childRoute)
+            return { ok: false, error: `Task not found: ${childName}` };
+        const childMod = await importRouteModule(projectRoot, childRoute.filePath);
+        if (typeof childMod.POST !== 'function')
+            return { ok: false, error: 'Task must export POST handler' };
+        const childRes = await runTaskOnce({
+            name: childName,
+            config: {
+                retries: typeof childRoute.config.retries === 'number' ? childRoute.config.retries : 0,
+                timeout: typeof childRoute.config.timeout === 'number' ? childRoute.config.timeout : 30_000,
+            },
+            handler: childMod.POST,
+        }, { input: childPayload, hasPlatform: false, localChildDispatch });
+        return childRes.status === 'completed'
+            ? { ok: true, result: childRes.result }
+            : { ok: false, error: childRes.error };
+    };
     const result = await runTaskOnce({
         name: taskName,
         config: {
@@ -82,8 +103,23 @@ async function runTask(projectRoot, taskName, rawInput) {
             timeout: typeof route.config.timeout === 'number' ? route.config.timeout : 30_000,
         },
         handler: mod.POST,
-    }, { input });
-    console.log(JSON.stringify(result, null, 2));
+        // Phase 1: validate --input against the task's optional `input` schema.
+        inputSchema: mod.input,
+    }, { input, hasPlatform: false, localChildDispatch });
+    // A schema validation failure never ran the handler — print the standard
+    // validation error body and exit 1.
+    if (result.validationError) {
+        console.error(JSON.stringify(result.validationError.body, null, 2));
+        process.exitCode = 1;
+        return;
+    }
+    // Print the additive run envelope ({ ok, taskName, attempts, result? }) plus
+    // the legacy status/error fields so existing consumers keep working.
+    const envelope = buildTaskEnvelope(taskName, result);
+    const output = { ...envelope, status: result.status };
+    if (result.error !== undefined)
+        output.error = result.error;
+    console.log(JSON.stringify(output, null, 2));
     if (result.status === 'failed') {
         process.exitCode = 1;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celsian/vura-cli",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Vura CLI — build and deploy full-stack apps",
   "type": "module",
   "bin": {
@@ -15,12 +15,12 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@celsian/vura-core": "0.5.4",
+    "@celsian/vura-core": "0.5.6",
     "esbuild": "^0.28.1",
     "what-framework": "^0.11.1"
   },
   "peerDependencies": {
-    "@celsian/vura-adapter-vura": "0.5.4",
+    "@celsian/vura-adapter-vura": "0.5.6",
     "ws": "^8.0.0"
   },
   "peerDependenciesMeta": {
@@ -32,7 +32,7 @@
     }
   },
   "devDependencies": {
-    "@celsian/vura-adapter-vura": "0.5.4",
+    "@celsian/vura-adapter-vura": "0.5.6",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0"
   },