@ontrails/trails 1.0.0-beta.23 → 1.0.0-beta.24

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # trails
 
+## 1.0.0-beta.24
+
+### Patch Changes
+
+- dac49c2: Restore caller-facing direct input for `trails run` so positional JSON,
+  `--input-json`, and `--input` payloads map to the target trail input unless
+  callers explicitly use the `input` wrapper for control-field collisions.
+  - @ontrails/commander@1.0.0-beta.24
+  - @ontrails/adapter-kit@1.0.0-beta.24
+  - @ontrails/cli@1.0.0-beta.24
+  - @ontrails/core@1.0.0-beta.24
+  - @ontrails/http@1.0.0-beta.24
+  - @ontrails/mcp@1.0.0-beta.24
+  - @ontrails/observe@1.0.0-beta.24
+  - @ontrails/permits@1.0.0-beta.24
+  - @ontrails/topographer@1.0.0-beta.24
+  - @ontrails/tracing@1.0.0-beta.24
+  - @ontrails/warden@1.0.0-beta.24
+  - @ontrails/wayfinder@1.0.0-beta.24
+
 ## 1.0.0-beta.23
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/trails",
-  "version": "1.0.0-beta.23",
+  "version": "1.0.0-beta.24",
   "bin": {
     "trails": "./bin/trails.ts"
   },
@@ -27,23 +27,23 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "@ontrails/adapter-kit": "^1.0.0-beta.23",
-    "@ontrails/cli": "^1.0.0-beta.23",
-    "@ontrails/commander": "^1.0.0-beta.23",
-    "@ontrails/core": "^1.0.0-beta.23",
-    "@ontrails/http": "^1.0.0-beta.23",
-    "@ontrails/mcp": "^1.0.0-beta.23",
-    "@ontrails/observe": "^1.0.0-beta.23",
-    "@ontrails/permits": "^1.0.0-beta.23",
-    "@ontrails/topographer": "^1.0.0-beta.23",
-    "@ontrails/tracing": "^1.0.0-beta.23",
-    "@ontrails/warden": "^1.0.0-beta.23",
-    "@ontrails/wayfinder": "^1.0.0-beta.23",
+    "@ontrails/adapter-kit": "^1.0.0-beta.24",
+    "@ontrails/cli": "^1.0.0-beta.24",
+    "@ontrails/commander": "^1.0.0-beta.24",
+    "@ontrails/core": "^1.0.0-beta.24",
+    "@ontrails/http": "^1.0.0-beta.24",
+    "@ontrails/mcp": "^1.0.0-beta.24",
+    "@ontrails/observe": "^1.0.0-beta.24",
+    "@ontrails/permits": "^1.0.0-beta.24",
+    "@ontrails/topographer": "^1.0.0-beta.24",
+    "@ontrails/tracing": "^1.0.0-beta.24",
+    "@ontrails/warden": "^1.0.0-beta.24",
+    "@ontrails/wayfinder": "^1.0.0-beta.24",
     "commander": "^14.0.3",
     "typescript": "^5.9.3",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@ontrails/testing": "^1.0.0-beta.23"
+    "@ontrails/testing": "^1.0.0-beta.24"
   }
 }

package/src/trails/run.ts

@@ -33,6 +33,7 @@ import {
   AmbiguousError,
   NotFoundError,
   Result,
+  ValidationError,
   run,
   trail,
 } from '@ontrails/core';
@@ -313,26 +314,58 @@ const buildAmbiguousExampleInput = (): {
   return { id: 'shared.id', rootDir: root };
 };
 
-const runTrailInputSchema = z.object({
-  app: z
-    .string()
-    .optional()
-    .describe(
-      'Workspace app to resolve the trail ID against; required when the ID is exposed by more than one app'
-    ),
-  id: z.string().describe('Trail ID to invoke'),
-  input: z
-    .unknown()
-    .optional()
-    .describe(
-      'Parsed input for the resolved trail; the CLI surface JSON.parses the inline argument before passing it through'
-    ),
-  module: z.string().optional().describe('Path to the app module'),
-  rootDir: z.string().optional().describe('Workspace root directory'),
-});
+const runTrailInputSchema = z
+  .object({
+    app: z
+      .string()
+      .optional()
+      .describe(
+        'Workspace app to resolve the trail ID against; required when the ID is exposed by more than one app'
+      ),
+    id: z.string().describe('Trail ID to invoke'),
+    input: z
+      .unknown()
+      .optional()
+      .describe(
+        'Parsed input for the resolved trail; the CLI surface JSON.parses the inline argument before passing it through'
+      ),
+    module: z.string().optional().describe('Path to the app module'),
+    rootDir: z.string().optional().describe('Workspace root directory'),
+  })
+  .catchall(z.unknown());
 
 type RunTrailInput = z.output<typeof runTrailInputSchema>;
 
+const RUN_TRAIL_CONTROL_KEYS = new Set([
+  'app',
+  'id',
+  'input',
+  'module',
+  'rootDir',
+]);
+
+const directInputEntries = (
+  input: RunTrailInput
+): readonly (readonly [string, unknown])[] =>
+  Object.entries(input).filter(([key]) => !RUN_TRAIL_CONTROL_KEYS.has(key));
+
+const resolveInnerTrailInput = (
+  input: RunTrailInput
+): Result<unknown, ValidationError> => {
+  const entries = directInputEntries(input);
+  if (entries.length === 0) {
+    return Result.ok(input.input);
+  }
+  if (Object.hasOwn(input, 'input')) {
+    return Result.err(
+      new ValidationError(
+        'trails run received both direct input fields and an explicit input wrapper. Use one shape: either {"name":"Alpha"} or {"input":{"name":"Alpha"}}.'
+      )
+    );
+  }
+  return Result.ok(Object.fromEntries(entries));
+};
+
 // ---------------------------------------------------------------------------
 // Trail definition
 // ---------------------------------------------------------------------------
@@ -345,6 +378,10 @@ export const runTrail = trail('run', {
       return rootDirResult;
     }
     const rootDir = rootDirResult.value;
+    const innerInput = resolveInnerTrailInput(input);
+    if (innerInput.isErr()) {
+      return innerInput;
+    }
 
     // Single-app back-compat: if the caller provided `module`, trust it.
     const moduleResolution = await resolveRunModulePath(
@@ -365,7 +402,7 @@ export const runTrail = trail('run', {
     const lease = leaseResult.value;
 
     try {
-      const result = await run(lease.app, input.id, input.input, {
+      const result = await run(lease.app, input.id, innerInput.value, {
         ctx: ctx.permit === undefined ? {} : { permit: ctx.permit },
       });
       if (result.isErr()) {