@cleocode/cleo 2026.4.11 → 2026.4.12

package/dist/cli/renderers/index.d.ts

@@ -14,16 +14,17 @@
  * @epic T4663
  */
 import { type FormatOptions } from '@cleocode/core';
+import type { CliMeta } from '@cleocode/lafs';
 export interface CliOutputOptions {
     /** Command name (used to pick the correct human renderer). */
     command: string;
-    /** Optional success message for JSON envelope. */
+    /** Optional success message for JSON envelope (attached to `meta.message`). */
     message?: string;
-    /** Operation name for LAFS _meta. */
+    /** Operation name for canonical envelope `meta.operation` (e.g. `"tasks.show"`). */
     operation?: string;
-    /** Pagination for LAFS envelope. */
+    /** Pagination metadata for canonical envelope `page` field. */
     page?: FormatOptions['page'];
-    /** Extra LAFS extensions. */
+    /** Extra metadata extensions merged into `meta`. */
     extensions?: Record<string, unknown>;
 }
 /**
@@ -41,19 +42,46 @@ export interface CliOutputOptions {
 export declare function cliOutput(data: unknown, opts: CliOutputOptions): void;
 /**
  * Error details for structured error output.
+ *
+ * Carries the full LAFS-compatible error context forwarded by the dispatch
+ * adapter from {@link DispatchError}. All fields are optional — only present
+ * fields are emitted in the output envelope.
+ *
+ * @see packages/cleo/src/dispatch/types.ts DispatchError
  */
 export interface CliErrorDetails {
+    /** Machine-readable error code name (e.g. `E_NOT_FOUND`). */
     name?: string;
+    /** Additional structured details from the error. */
     details?: unknown;
+    /** Copy-paste fix hint for the operator or agent. */
     fix?: unknown;
+    /** Alternative actions the caller can try. */
+    alternatives?: Array<{
+        action: string;
+        command: string;
+    }>;
 }
 /**
  * Output an error in the resolved format.
- * For JSON: delegates to formatError (already handled in command catch blocks).
- * For human: prints a plain error message to stderr.
+ *
+ * In JSON format (default / agent mode): emits a canonical `CliEnvelope` error
+ * envelope to stdout. The envelope always includes `meta` (ADR-039).
+ * All optional fields (`codeName`, `fix`, `alternatives`, `details`) are
+ * included only when they are actually present — no `undefined` keys are emitted.
+ *
+ * In human format: prints a plain error line to stderr and, when
+ * `details.fix` is a string, appends a `Fix: <hint>` line.
+ *
+ * @param message - Human-readable error message.
+ * @param code    - Numeric exit code or string error code.
+ * @param details - Optional structured details (codeName, fix, alternatives, …).
+ * @param meta    - Optional partial meta to merge into the error envelope.
  *
  * @task T4666
  * @task T4813
+ * @task T336
+ * @task T338
  */
-export declare function cliError(message: string, code?: number | string, _details?: CliErrorDetails): void;
+export declare function cliError(message: string, code?: number | string, details?: CliErrorDetails, meta?: Partial<CliMeta>): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/renderers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/renderers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AA+EnE,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CA2HrE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,QAAQ,CAAC,EAAE,eAAe,GACzB,IAAI,CAeN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/renderers/index.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAe,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA8E3D,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAsIrE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qDAAqD;IACrD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8CAA8C;IAC9C,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,CAAC,EAAE,eAAe,EACzB,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GACtB,IAAI,CA0CN"}

package/dist/cli/renderers/index.js

@@ -1,3 +1,13 @@
+import { randomUUID } from 'node:crypto';
+/**
+ * Generate a request UUID for error envelopes.
+ * Extracted to keep the hot path synchronous.
+ *
+ * @internal
+ */
+function generateRequestId() {
+    return randomUUID();
+}
 /**
  * Central output dispatch for V2 CLI commands.
  *
@@ -109,6 +119,8 @@ export function cliOutput(data, opts) {
     // --field: single-field plain text extraction (scripting / agent use).
     // Centralised here so ALL commands (dispatchFromCli and dispatchRaw) honour the flag.
     if (fieldCtx.field) {
+        // extractFieldFromResult operates on the data payload (not the envelope).
+        // Cast to the proto-envelope result type for the SDK call.
         const value = extractFieldFromResult(data, fieldCtx.field);
         if (value === undefined) {
             cliError(`Field "${fieldCtx.field}" not found`, 4, { name: 'E_NOT_FOUND' });
@@ -118,13 +130,14 @@ export function cliOutput(data, opts) {
         process.stdout.write(out + '\n');
         return;
     }
-    // JSON format (default): apply --fields filter, then emit LAFS envelope.
+    // JSON format (default): apply --fields filter, then emit canonical CLI envelope.
     // Centralised here so ALL commands honour the flag without per-command wiring.
     // applyFieldFilter can throw on unusual mixed-type arrays (e.g. changes: ['status']).
     // In that case we fall back to unfiltered output rather than crashing.
     let filteredData = data;
     if (fieldCtx.fields?.length && data !== undefined && data !== null) {
         try {
+            // Build a proto-envelope stub to drive the SDK field filter (ADR-039 bridge).
             const stub = {
                 $schema: 'https://lafs.dev/schemas/v1/envelope.schema.json',
                 _meta: {
@@ -149,8 +162,7 @@ export function cliOutput(data, opts) {
             // supported. Fall through to emit the full unfiltered result.
         }
     }
-    // Per LAFS §9.1 (v1.5.0 clarification): _meta MUST always be present.
-    // --mvi minimal governs result contents only; mvi level is reflected in _meta.mvi.
+    // Build FormatOptions for formatSuccess (now emits canonical CliEnvelope shape).
     const formatOpts = {};
     if (opts.operation)
         formatOpts.operation = opts.operation;
@@ -187,22 +199,64 @@ export function cliOutput(data, opts) {
 }
 /**
  * Output an error in the resolved format.
- * For JSON: delegates to formatError (already handled in command catch blocks).
- * For human: prints a plain error message to stderr.
+ *
+ * In JSON format (default / agent mode): emits a canonical `CliEnvelope` error
+ * envelope to stdout. The envelope always includes `meta` (ADR-039).
+ * All optional fields (`codeName`, `fix`, `alternatives`, `details`) are
+ * included only when they are actually present — no `undefined` keys are emitted.
+ *
+ * In human format: prints a plain error line to stderr and, when
+ * `details.fix` is a string, appends a `Fix: <hint>` line.
+ *
+ * @param message - Human-readable error message.
+ * @param code    - Numeric exit code or string error code.
+ * @param details - Optional structured details (codeName, fix, alternatives, …).
+ * @param meta    - Optional partial meta to merge into the error envelope.
  *
  * @task T4666
  * @task T4813
+ * @task T336
+ * @task T338
  */
-export function cliError(message, code, _details) {
+export function cliError(message, code, details, meta) {
     const ctx = getFormatContext();
     if (ctx.format === 'human') {
         console.error(`Error: ${message}${code ? ` (${code})` : ''}`);
+        if (typeof details?.fix === 'string') {
+            console.error(`Fix: ${details.fix}`);
+        }
         return;
     }
-    // JSON envelope always goes to stdout for consistent machine-readable output
-    console.log(JSON.stringify({
+    // JSON envelope always goes to stdout for consistent machine-readable output.
+    // Build the error object incrementally so that absent optional fields are
+    // never serialised as `undefined` (which JSON.stringify would strip anyway,
+    // but being explicit keeps the intent clear and avoids lint warnings).
+    const errorObj = {
+        code: code ?? 1,
+        message,
+    };
+    if (details?.name !== undefined)
+        errorObj['codeName'] = details.name;
+    if (details?.fix !== undefined)
+        errorObj['fix'] = details.fix;
+    if (details?.alternatives !== undefined)
+        errorObj['alternatives'] = details.alternatives;
+    if (details?.details !== undefined)
+        errorObj['details'] = details.details;
+    // Canonical error envelope: {success, error, meta} — meta is ALWAYS present.
+    // Merge caller-supplied meta with defaults (ADR-039).
+    const errorMeta = {
+        operation: meta?.operation ?? 'cli.error',
+        requestId: meta?.requestId ?? generateRequestId(),
+        duration_ms: meta?.duration_ms ?? 0,
+        timestamp: meta?.timestamp ?? new Date().toISOString(),
+        ...meta,
+    };
+    const envelope = {
         success: false,
-        error: { code: code ?? 1, message },
-    }));
+        error: errorObj,
+        meta: errorMeta,
+    };
+    console.log(JSON.stringify(envelope));
 }
 //# sourceMappingURL=index.js.map

package/dist/cli/renderers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/renderers/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/renderers/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/renderers/lafs-validator.d.ts

@@ -1,28 +1,21 @@
 /**
- * LAFS envelope validator middleware (Phase 6).
+ * CLI envelope validator middleware (Phase 6 / ADR-039 update).
  *
  * Every CLI envelope emitted by `cliOutput()` flows through this module
- * before hitting stdout. The middleware delegates to the canonical LAFS
- * validators where they exist and adds a thin shape check for the agent-
- * optimized **minimal envelope** format that the canonical schema does
- * not cover.
+ * before hitting stdout. Validates the **canonical CLI envelope** shape
+ * (`{success, data?, error?, meta, page?}`) as defined in ADR-039.
  *
- * **SSoT alignment** (post-review):
- *   - Full envelopes (`{$schema, _meta, success, result}`) are validated
- *     by `validateEnvelope()` from `@cleocode/lafs`, which uses the
- *     `lafs-napi` Rust binding (with AJV fallback) and the canonical
- *     schema at `packages/lafs/schemas/v1/envelope.schema.json`.
- *   - Minimal envelopes (`{ok, r, _m}`) are agent-optimized and not part
- *     of the public LAFS schema. We validate their shape locally with
- *     the lightweight invariant check below.
+ * The canonical shape replaces the three legacy shapes:
+ *   - `{ok, r, _m}` (minimal MVI — removed)
+ *   - `{$schema, _meta, success, result}` (full LAFS — migrated)
+ *   - `{success, result}` (observe command — migrated)
  *
- * Validation invariants enforced HERE (minimal envelopes only):
- *   - Envelope MUST be a JSON object (parseable from a string)
- *   - Envelope MUST have exactly one of {`ok`, `success`}
- *   - The success indicator MUST be a boolean
- *   - On success, `r` / `result` MUST exist (may be null)
+ * Validation invariants:
+ *   - Envelope MUST be a JSON object
+ *   - `success` MUST be present and boolean
+ *   - On success, `data` MUST exist (may be null)
  *   - On failure, `error` MUST exist with at least `code` and `message`
- *   - `_m` / `_meta` MUST be present in some form
+ *   - `meta` MUST be present (always — success and failure)
  *
  * When a violation is detected, the validator:
  *   1. Wraps the malformed output in a valid error envelope
@@ -30,37 +23,38 @@
  *   3. Emits the wrapped envelope to stderr for diagnostic tooling
  *
  * @task Phase 6 — LAFS formalization + schema consolidation
- * @see packages/lafs/src/validateEnvelope.ts — canonical full-envelope validator
- * @see packages/lafs/schemas/v1/envelope.schema.json — canonical full-envelope schema
- * @see crates/lafs-core — Rust embed of the canonical schema
+ * @task T338 — ADR-039 canonical envelope unification
  */
 import { ExitCode } from '@cleocode/contracts';
 /**
- * The minimum shape invariants for a LAFS envelope, compatible with both
- * minimal (`{ok, r, _m}`) and full (`{success, result, _meta}`) formats.
+ * Shape violation report for a canonical CLI envelope.
+ *
+ * Carries the individual invariant results so diagnostic tooling can
+ * report exactly which invariants were violated.
  */
 export interface LafsShapeViolation {
     /** True iff the input is a well-formed JSON object. */
     isObject: boolean;
-    /** True iff the envelope has exactly one success-indicator field. */
+    /** True iff `success` is present. */
     hasSuccessField: boolean;
-    /** True iff the success-indicator is a boolean. */
+    /** True iff `success` is a boolean. */
     successIsBoolean: boolean;
-    /** True iff a metadata field (`_m` or `_meta`) is present. */
+    /** True iff `meta` is present (always required — ADR-039). */
     hasMeta: boolean;
-    /** True iff the result/error invariants hold for the indicated success value. */
+    /** True iff the data/error invariants hold for the indicated success value. */
     resultOrErrorValid: boolean;
     /** Human-readable reasons the envelope failed validation (empty = valid). */
     reasons: string[];
 }
 /**
- * Validate a LAFS envelope shape and report violations.
+ * Validate a canonical CLI envelope shape and report violations.
  *
- * Full envelopes are delegated to `@cleocode/lafs.validateEnvelope()` (which
- * uses the canonical schema via lafs-napi/AJV). Minimal envelopes are
- * checked against the lightweight invariants in this module.
+ * Validates the unified `{success, data?, error?, meta, page?}` shape
+ * defined in ADR-039. All three legacy shapes (`{ok,r,_m}`,
+ * `{$schema,_meta,success,result}`, `{success,result}`) are now invalid
+ * and will produce violation reports.
  *
- * @param envelope - The candidate envelope (serialized string or object)
+ * @param envelope - The candidate envelope (serialized string or parsed object).
  * @returns A `LafsShapeViolation` report. `.reasons.length === 0` when valid.
  */
 export declare function validateLafsShape(envelope: unknown): LafsShapeViolation;

package/dist/cli/renderers/lafs-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lafs-validator.d.ts","sourceRoot":"","sources":["../../../src/cli/renderers/lafs-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,uDAAuD;IACvD,QAAQ,EAAE,OAAO,CAAC;IAClB,qEAAqE;IACrE,eAAe,EAAE,OAAO,CAAC;IACzB,mDAAmD;IACnD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,8DAA8D;IAC9D,OAAO,EAAE,OAAO,CAAC;IACjB,iFAAiF;IACjF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAoBD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,kBAAkB,CAwHvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAQvD;AAED;;;;;GAKG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,IAAI,2BAA2B;IACxC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;gBAExB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKxD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAmB/D"}
+{"version":3,"file":"lafs-validator.d.ts","sourceRoot":"","sources":["../../../src/cli/renderers/lafs-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,uDAAuD;IACvD,QAAQ,EAAE,OAAO,CAAC;IAClB,qCAAqC;IACrC,eAAe,EAAE,OAAO,CAAC;IACzB,uCAAuC;IACvC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,8DAA8D;IAC9D,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,kBAAkB,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,kBAAkB,CAqFvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAQvD;AAED;;;;;GAKG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,IAAI,2BAA2B;IACxC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;gBAExB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKxD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAqB/D"}

package/dist/cli/renderers/lafs-validator.js

@@ -1,28 +1,21 @@
 /**
- * LAFS envelope validator middleware (Phase 6).
+ * CLI envelope validator middleware (Phase 6 / ADR-039 update).
  *
  * Every CLI envelope emitted by `cliOutput()` flows through this module
- * before hitting stdout. The middleware delegates to the canonical LAFS
- * validators where they exist and adds a thin shape check for the agent-
- * optimized **minimal envelope** format that the canonical schema does
- * not cover.
+ * before hitting stdout. Validates the **canonical CLI envelope** shape
+ * (`{success, data?, error?, meta, page?}`) as defined in ADR-039.
  *
- * **SSoT alignment** (post-review):
- *   - Full envelopes (`{$schema, _meta, success, result}`) are validated
- *     by `validateEnvelope()` from `@cleocode/lafs`, which uses the
- *     `lafs-napi` Rust binding (with AJV fallback) and the canonical
- *     schema at `packages/lafs/schemas/v1/envelope.schema.json`.
- *   - Minimal envelopes (`{ok, r, _m}`) are agent-optimized and not part
- *     of the public LAFS schema. We validate their shape locally with
- *     the lightweight invariant check below.
+ * The canonical shape replaces the three legacy shapes:
+ *   - `{ok, r, _m}` (minimal MVI — removed)
+ *   - `{$schema, _meta, success, result}` (full LAFS — migrated)
+ *   - `{success, result}` (observe command — migrated)
  *
- * Validation invariants enforced HERE (minimal envelopes only):
- *   - Envelope MUST be a JSON object (parseable from a string)
- *   - Envelope MUST have exactly one of {`ok`, `success`}
- *   - The success indicator MUST be a boolean
- *   - On success, `r` / `result` MUST exist (may be null)
+ * Validation invariants:
+ *   - Envelope MUST be a JSON object
+ *   - `success` MUST be present and boolean
+ *   - On success, `data` MUST exist (may be null)
  *   - On failure, `error` MUST exist with at least `code` and `message`
- *   - `_m` / `_meta` MUST be present in some form
+ *   - `meta` MUST be present (always — success and failure)
  *
  * When a violation is detected, the validator:
  *   1. Wraps the malformed output in a valid error envelope
@@ -30,37 +23,21 @@
  *   3. Emits the wrapped envelope to stderr for diagnostic tooling
  *
  * @task Phase 6 — LAFS formalization + schema consolidation
- * @see packages/lafs/src/validateEnvelope.ts — canonical full-envelope validator
- * @see packages/lafs/schemas/v1/envelope.schema.json — canonical full-envelope schema
- * @see crates/lafs-core — Rust embed of the canonical schema
+ * @task T338 — ADR-039 canonical envelope unification
  */
 import { ExitCode } from '@cleocode/contracts';
-const ENVELOPE_OK_KEY_MINIMAL = 'ok';
-const ENVELOPE_OK_KEY_FULL = 'success';
-const ENVELOPE_RESULT_KEY_MINIMAL = 'r';
-const ENVELOPE_RESULT_KEY_FULL = 'result';
-const ENVELOPE_META_KEYS = ['_m', '_meta'];
+const ENVELOPE_SUCCESS_KEY = 'success';
+const ENVELOPE_DATA_KEY = 'data';
+const ENVELOPE_META_KEY = 'meta';
 /**
- * Detect whether a parsed envelope is a "full" or "minimal" LAFS shape.
+ * Validate a canonical CLI envelope shape and report violations.
  *
- * Full shape uses {`success`, `result`, `_meta`}; minimal shape uses
- * {`ok`, `r`, `_m`}. Returns 'unknown' when neither indicator is present.
- */
-function detectEnvelopeFlavor(obj) {
-    if ('success' in obj || '_meta' in obj || '$schema' in obj)
-        return 'full';
-    if ('ok' in obj || '_m' in obj)
-        return 'minimal';
-    return 'unknown';
-}
-/**
- * Validate a LAFS envelope shape and report violations.
+ * Validates the unified `{success, data?, error?, meta, page?}` shape
+ * defined in ADR-039. All three legacy shapes (`{ok,r,_m}`,
+ * `{$schema,_meta,success,result}`, `{success,result}`) are now invalid
+ * and will produce violation reports.
  *
- * Full envelopes are delegated to `@cleocode/lafs.validateEnvelope()` (which
- * uses the canonical schema via lafs-napi/AJV). Minimal envelopes are
- * checked against the lightweight invariants in this module.
- *
- * @param envelope - The candidate envelope (serialized string or object)
+ * @param envelope - The candidate envelope (serialized string or parsed object).
  * @returns A `LafsShapeViolation` report. `.reasons.length === 0` when valid.
  */
 export function validateLafsShape(envelope) {
@@ -89,61 +66,29 @@ export function validateLafsShape(envelope) {
     }
     report.isObject = true;
     const obj = parsed;
-    // SSoT delegation: full envelopes go through @cleocode/lafs.validateEnvelope
-    // which validates against the canonical packages/lafs/schemas/v1/envelope.schema.json
-    // (via the lafs-napi Rust binding when available, AJV fallback otherwise).
-    // We only inspect minimal envelopes locally because they're an internal
-    // agent-optimized format that the canonical schema does not cover.
-    const flavor = detectEnvelopeFlavor(obj);
-    if (flavor === 'full') {
-        try {
-            // Lazy require to avoid pulling lafs into the cli bundle's hot path.
-            // The package exports validateEnvelope() at the package root.
-            // biome-ignore lint/suspicious/noExplicitAny: dynamic import shape
-            const lafs = require('@cleocode/lafs');
-            const result = lafs.validateEnvelope(obj);
-            report.hasSuccessField = true;
-            report.successIsBoolean = true;
-            report.hasMeta = true;
-            report.resultOrErrorValid = result.valid;
-            if (!result.valid) {
-                for (const err of result.errors) {
-                    report.reasons.push(`canonical validator: ${err}`);
-                }
-            }
-            return report;
-        }
-        catch (loadErr) {
-            // Fall through to the local minimal-shape check if @cleocode/lafs
-            // can't be loaded for any reason — better than failing closed.
-            report.reasons.push(`Could not load canonical LAFS validator (${loadErr instanceof Error ? loadErr.message : String(loadErr)}); falling back to local shape check`);
-            // continue to the minimal-shape path below
-        }
-    }
-    // Success-indicator field presence
-    const hasMinimal = ENVELOPE_OK_KEY_MINIMAL in obj;
-    const hasFull = ENVELOPE_OK_KEY_FULL in obj;
-    if (!hasMinimal && !hasFull) {
-        report.reasons.push(`Envelope missing success indicator — expected one of: ${ENVELOPE_OK_KEY_MINIMAL}, ${ENVELOPE_OK_KEY_FULL}`);
+    // Success-indicator field presence (`success`, not legacy `ok`)
+    if (!(ENVELOPE_SUCCESS_KEY in obj)) {
+        report.reasons.push(`Envelope missing success indicator — expected: "${ENVELOPE_SUCCESS_KEY}"`);
         return report;
     }
     report.hasSuccessField = true;
-    const successValue = hasMinimal ? obj[ENVELOPE_OK_KEY_MINIMAL] : obj[ENVELOPE_OK_KEY_FULL];
+    const successValue = obj[ENVELOPE_SUCCESS_KEY];
     if (typeof successValue !== 'boolean') {
-        report.reasons.push(`Envelope success field must be boolean, got ${typeof successValue}`);
+        report.reasons.push(`Envelope "${ENVELOPE_SUCCESS_KEY}" field must be boolean, got ${typeof successValue}`);
         return report;
     }
     report.successIsBoolean = true;
-    // Metadata presence
-    report.hasMeta = ENVELOPE_META_KEYS.some((key) => key in obj);
+    // `meta` MUST be present and an object on every envelope (ADR-039)
+    report.hasMeta = ENVELOPE_META_KEY in obj && typeof obj[ENVELOPE_META_KEY] === 'object';
     if (!report.hasMeta) {
-        report.reasons.push(`Envelope missing metadata — expected one of: ${ENVELOPE_META_KEYS.join(', ')}`);
+        report.reasons.push(`Envelope missing required "${ENVELOPE_META_KEY}" object (ADR-039 — every envelope must carry meta)`);
     }
     // Success / error invariants
     if (successValue === true) {
-        const hasResult = ENVELOPE_RESULT_KEY_MINIMAL in obj || ENVELOPE_RESULT_KEY_FULL in obj;
-        if (!hasResult) {
-            report.reasons.push(`Successful envelope missing result field (${ENVELOPE_RESULT_KEY_MINIMAL} | ${ENVELOPE_RESULT_KEY_FULL})`);
+        // Successful envelopes carry `data` (not legacy `result` or `r`)
+        const hasData = ENVELOPE_DATA_KEY in obj;
+        if (!hasData) {
+            report.reasons.push(`Successful envelope missing "${ENVELOPE_DATA_KEY}" field (legacy "result" / "r" are no longer valid — ADR-039)`);
         }
         else {
             report.resultOrErrorValid = true;
@@ -152,14 +97,14 @@ export function validateLafsShape(envelope) {
     else {
         const errorField = obj['error'];
         if (typeof errorField !== 'object' || errorField === null) {
-            report.reasons.push('Failed envelope missing error object');
+            report.reasons.push('Failed envelope missing "error" object');
         }
         else {
             const err = errorField;
             const hasCode = 'code' in err;
             const hasMessage = 'message' in err && typeof err['message'] === 'string';
             if (!hasCode || !hasMessage) {
-                report.reasons.push('Failed envelope error object must contain code and message (string)');
+                report.reasons.push('Failed envelope "error" object must contain "code" and "message" (string)');
             }
             else {
                 report.resultOrErrorValid = true;
@@ -207,20 +152,22 @@ export class LafsViolationError extends Error {
  * emitted envelope turns out to be malformed.
  */
 export function emitLafsViolation(err) {
+    // Emit canonical CLI envelope shape (ADR-039) even for violation errors
     const envelope = {
-        ok: false,
+        success: false,
         error: {
-            code: 'E_LAFS_VIOLATION',
+            code: ExitCode.LAFS_VIOLATION,
+            codeName: 'E_LAFS_VIOLATION',
             message: err.message,
-            category: 'internal',
             details: {
-                exitCode: ExitCode.LAFS_VIOLATION,
                 report: err.report,
             },
         },
-        _m: {
-            op: 'cli.lafs-validator',
-            rid: 'lafs-validator-emit',
+        meta: {
+            operation: 'cli.lafs-validator',
+            requestId: 'lafs-validator-emit',
+            duration_ms: 0,
+            timestamp: new Date().toISOString(),
         },
     };
     process.stderr.write(`${JSON.stringify(envelope)}\n`);

package/dist/cli/renderers/lafs-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"lafs-validator.js","sourceRoot":"","sources":["../../../src/cli/renderers/lafs-validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lafs-validator.js","sourceRoot":"","sources":["../../../src/cli/renderers/lafs-validator.ts"],"names":[],"mappings":"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"}

package/dist/dispatch/adapters/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/dispatch/adapters/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,KAAK,gBAAgB,EAAuB,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAM9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAsC7D;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,CAK7C;AAmBD;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,UAAU,CAWhD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAMD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC5C,IAAI,CAUN;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CA2C3B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/dispatch/adapters/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,KAAK,gBAAgB,EAAuB,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAM9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAsC7D;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,CAK7C;AAmBD;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,UAAU,CAWhD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAMD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAuFf;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC5C,IAAI,CAsBN;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CA2C3B"}

package/dist/dispatch/adapters/cli.js

@@ -169,8 +169,8 @@ export async function dispatchFromCli(gateway, domain, operation, params, output
             gateway,
             domain,
             operation,
-            sessionId: response._meta.sessionId,
-            requestId: response._meta.requestId,
+            sessionId: response.meta.sessionId,
+            requestId: response.meta.requestId,
             cwd: getProjectRoot(),
         });
         const opts = {
@@ -191,6 +191,13 @@ export async function dispatchFromCli(gateway, domain, operation, params, output
             name: errorCode,
             details: response.error?.details,
             fix: response.error?.fix,
+            alternatives: response.error?.alternatives,
+        }, {
+            operation: `${domain}.${operation}`,
+            requestId: response.meta.requestId,
+            duration_ms: response.meta.duration_ms,
+            timestamp: response.meta.timestamp,
+            ...(response.meta.sessionId ? { sessionId: response.meta.sessionId } : {}),
         });
         process.exit(exitCode);
     }
@@ -210,6 +217,13 @@ export function handleRawError(response, _opts) {
         name: errorCode,
         details: response.error?.details,
         fix: response.error?.fix,
+        alternatives: response.error?.alternatives,
+    }, {
+        operation: _opts.operation,
+        requestId: response.meta.requestId,
+        duration_ms: response.meta.duration_ms,
+        timestamp: response.meta.timestamp,
+        ...(response.meta.sessionId ? { sessionId: response.meta.sessionId } : {}),
     });
     process.exit(exitCode);
 }