@baseplate-dev/project-builder-server 0.6.2 → 0.6.4

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @baseplate-dev/project-builder-server
 
+## 0.6.4
+
+### Patch Changes
+
+- Updated dependencies [[`ba315aa`](https://github.com/halfdomelabs/baseplate/commit/ba315aaaec0e8842ec7fadb765b1fed5e3abda5a)]:
+  - @baseplate-dev/project-builder-lib@0.6.4
+  - @baseplate-dev/core-generators@0.6.4
+  - @baseplate-dev/fastify-generators@0.6.4
+  - @baseplate-dev/react-generators@0.6.4
+  - @baseplate-dev/sync@0.6.4
+  - @baseplate-dev/utils@0.6.4
+
+## 0.6.3
+
+### Patch Changes
+
+- [#835](https://github.com/halfdomelabs/baseplate/pull/835) [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931) Thanks [@kingston](https://github.com/kingston)! - Add support for indexes on tables, mirroring the existing unique constraints implementation
+
+- [#835](https://github.com/halfdomelabs/baseplate/pull/835) [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931) Thanks [@kingston](https://github.com/kingston)! - Extract Sentry into standalone plugin package `@baseplate-dev/plugin-observability` and add migration to auto-enable Sentry plugin on existing projects
+
+- [#835](https://github.com/halfdomelabs/baseplate/pull/835) [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931) Thanks [@kingston](https://github.com/kingston)! - Extract Stripe into standalone `@baseplate-dev/plugin-payments` package. Stripe is now managed through the plugin system instead of the `enableStripe` boolean on backend app config. Includes migration to automatically convert existing projects. Overhaul Stripe implementation to provide billing support.
+
+- [#835](https://github.com/halfdomelabs/baseplate/pull/835) [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931) Thanks [@kingston](https://github.com/kingston)! - Support literal value comparisons in authorization expressions (e.g. `model.status === 'active'`, `model.isPublished !== false`)
+
+- [#835](https://github.com/halfdomelabs/baseplate/pull/835) [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931) Thanks [@kingston](https://github.com/kingston)! - MCP server improvements: apply fixRefDeletions and applyDefinitionFixes when staging changes, add entity search action, expose auto-fix suggestions with apply-fix action, add plugin management actions (list, configure, disable), blacklist plugin entity type from generic entity operations
+
+- Updated dependencies [[`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931), [`8072019`](https://github.com/halfdomelabs/baseplate/commit/8072019942287ee35720520d08f517272510c931)]:
+  - @baseplate-dev/react-generators@0.6.3
+  - @baseplate-dev/fastify-generators@0.6.3
+  - @baseplate-dev/project-builder-lib@0.6.3
+  - @baseplate-dev/sync@0.6.3
+  - @baseplate-dev/core-generators@0.6.3
+  - @baseplate-dev/utils@0.6.3
+
 ## 0.6.2
 
 ### Patch Changes

package/LICENSE

@@ -7,30 +7,30 @@ This project is licensed under the Mozilla Public License 2.0 (MPL-2.0) with the
 **Generated Code Exception**: All code generated by Baseplate generators and templates belongs entirely to the user who generated it. Half Dome Labs LLC disclaims any copyright interest in generated code. Users may use, modify, distribute, and license generated code under any terms they choose, including proprietary licenses, with no restrictions or attribution requirements.
 
 # Mozilla Public License Version 2.0
+==================================
 
 1. Definitions
-
----
+--------------
 
 1.1. "Contributor"
-means each individual or legal entity that creates, contributes to
-the creation of, or owns Covered Software.
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
 
 1.2. "Contributor Version"
-means the combination of the Contributions of others (if any) used
-by a Contributor and that particular Contributor's Contribution.
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
 
 1.3. "Contribution"
-means Covered Software of a particular Contributor.
+    means Covered Software of a particular Contributor.
 
 1.4. "Covered Software"
-means Source Code Form to which the initial Contributor has attached
-the notice in Exhibit A, the Executable Form of such Source Code
-Form, and Modifications of such Source Code Form, in each case
-including portions thereof.
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
 
 1.5. "Incompatible With Secondary Licenses"
-means
+    means
 
     (a) that the initial Contributor has attached the notice described
         in Exhibit B to the Covered Software; or
@@ -40,22 +40,22 @@ means
         terms of a Secondary License.
 
 1.6. "Executable Form"
-means any form of the work other than Source Code Form.
+    means any form of the work other than Source Code Form.
 
 1.7. "Larger Work"
-means a work that combines Covered Software with other material, in
-a separate file or files, that is not Covered Software.
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
 
 1.8. "License"
-means this document.
+    means this document.
 
 1.9. "Licensable"
-means having the right to grant, to the maximum extent possible,
-whether at the time of the initial grant or subsequently, any and
-all of the rights conveyed by this License.
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
 
 1.10. "Modifications"
-means any of the following:
+    means any of the following:
 
     (a) any file in Source Code Form that results from an addition to,
         deletion from, or modification of the contents of Covered
@@ -65,35 +65,34 @@ means any of the following:
         Software.
 
 1.11. "Patent Claims" of a Contributor
-means any patent claim(s), including without limitation, method,
-process, and apparatus claims, in any patent Licensable by such
-Contributor that would be infringed, but for the grant of the
-License, by the making, using, selling, offering for sale, having
-made, import, or transfer of either its Contributions or its
-Contributor Version.
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
 
 1.12. "Secondary License"
-means either the GNU General Public License, Version 2.0, the GNU
-Lesser General Public License, Version 2.1, the GNU Affero General
-Public License, Version 3.0, or any later versions of those
-licenses.
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
 
 1.13. "Source Code Form"
-means the form of the work preferred for making modifications.
+    means the form of the work preferred for making modifications.
 
 1.14. "You" (or "Your")
-means an individual or a legal entity exercising rights under this
-License. For legal entities, "You" includes any entity that
-controls, is controlled by, or is under common control with You. For
-purposes of this definition, "control" means (a) the power, direct
-or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (b) ownership of more than
-fifty percent (50%) of the outstanding shares or beneficial
-ownership of such entity.
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
 
 2. License Grants and Conditions
-
----
+--------------------------------
 
 2.1. Grants
 
@@ -101,14 +100,14 @@ Each Contributor hereby grants You a world-wide, royalty-free,
 non-exclusive license:
 
 (a) under intellectual property rights (other than patent or trademark)
-Licensable by such Contributor to use, reproduce, make available,
-modify, display, perform, distribute, and otherwise exploit its
-Contributions, either on an unmodified basis, with Modifications, or
-as part of a Larger Work; and
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
 
 (b) under Patent Claims of such Contributor to make, use, sell, offer
-for sale, have made, import, and otherwise transfer either its
-Contributions or its Contributor Version.
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
 
 2.2. Effective Date
 
@@ -125,15 +124,15 @@ Notwithstanding Section 2.1(b) above, no patent license is granted by a
 Contributor:
 
 (a) for any code that a Contributor has removed from Covered Software;
-or
+    or
 
 (b) for infringements caused by: (i) Your and any other third party's
-modifications of Covered Software, or (ii) the combination of its
-Contributions with other software (except as part of its Contributor
-Version); or
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
 
 (c) under Patent Claims infringed by Covered Software in the absence of
-its Contributions.
+    its Contributions.
 
 This License does not grant any rights in the trademarks, service marks,
 or logos of any Contributor (except as may be necessary to comply with
@@ -164,8 +163,7 @@ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
 in Section 2.1.
 
 3. Responsibilities
-
----
+-------------------
 
 3.1. Distribution of Source Form
 
@@ -182,15 +180,15 @@ Form.
 If You distribute Covered Software in Executable Form then:
 
 (a) such Covered Software must also be made available in Source Code
-Form, as described in Section 3.1, and You must inform recipients of
-the Executable Form how they can obtain a copy of such Source Code
-Form by reasonable means in a timely manner, at a charge no more
-than the cost of distribution to the recipient; and
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
 
 (b) You may distribute such Executable Form under the terms of this
-License, or sublicense it under different terms, provided that the
-license for the Executable Form does not attempt to limit or alter
-the recipients' rights in the Source Code Form under this License.
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
 
 3.3. Distribution of a Larger Work
 
@@ -227,8 +225,7 @@ disclaimers of warranty and limitations of liability specific to any
 jurisdiction.
 
 4. Inability to Comply Due to Statute or Regulation
-
----
+---------------------------------------------------
 
 If it is impossible for You to comply with any of the terms of this
 License with respect to some or all of the Covered Software due to
@@ -241,8 +238,7 @@ or regulation, such description must be sufficiently detailed for a
 recipient of ordinary skill to be able to understand it.
 
 5. Termination
-
----
+--------------
 
 5.1. The rights granted under this License will terminate automatically
 if You fail to comply with any of its terms. However, if You become
@@ -270,55 +266,50 @@ end user license agreements (excluding distributors and resellers) which
 have been validly granted by You or Your distributors under this License
 prior to termination shall survive termination.
 
----
-
--                                                                      *
-- 6.  Disclaimer of Warranty \*
-- ------------------------- \*
--                                                                      *
-- Covered Software is provided under this License on an "as is" \*
-- basis, without warranty of any kind, either expressed, implied, or \*
-- statutory, including, without limitation, warranties that the \*
-- Covered Software is free of defects, merchantable, fit for a \*
-- particular purpose or non-infringing. The entire risk as to the \*
-- quality and performance of the Covered Software is with You. \*
-- Should any Covered Software prove defective in any respect, You \*
-- (not any Contributor) assume the cost of any necessary servicing, \*
-- repair, or correction. This disclaimer of warranty constitutes an \*
-- essential part of this License. No use of any Covered Software is \*
-- authorized under this License except under this disclaimer. \*
--                                                                      *
-
----
-
----
-
--                                                                      *
-- 7.  Limitation of Liability \*
-- -------------------------- \*
--                                                                      *
-- Under no circumstances and under no legal theory, whether tort \*
-- (including negligence), contract, or otherwise, shall any \*
-- Contributor, or anyone who distributes Covered Software as \*
-- permitted above, be liable to You for any direct, indirect, \*
-- special, incidental, or consequential damages of any character \*
-- including, without limitation, damages for lost profits, loss of \*
-- goodwill, work stoppage, computer failure or malfunction, or any \*
-- and all other commercial damages or losses, even if such party \*
-- shall have been informed of the possibility of such damages. This \*
-- limitation of liability shall not apply to liability for death or \*
-- personal injury resulting from such party's negligence to the \*
-- extent applicable law prohibits such limitation. Some \*
-- jurisdictions do not allow the exclusion or limitation of \*
-- incidental or consequential damages, so this exclusion and \*
-- limitation may not apply to You. \*
--                                                                      *
-
----
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
 
 8. Litigation
-
----
+-------------
 
 Any litigation relating to this License may be brought only in the
 courts of a jurisdiction where the defendant maintains its principal
@@ -328,8 +319,7 @@ Nothing in this Section shall prevent a party's ability to bring
 cross-claims or counter-claims.
 
 9. Miscellaneous
-
----
+----------------
 
 This License represents the complete agreement concerning the subject
 matter hereof. If any provision of this License is held to be
@@ -339,8 +329,7 @@ that the language of a contract shall be construed against the drafter
 shall not be used to construe this License against a Contributor.
 
 10. Versions of the License
-
----
+---------------------------
 
 10.1. New Versions
 
@@ -371,11 +360,12 @@ If You choose to distribute Source Code Form that is Incompatible With
 Secondary Licenses under the terms of this version of the License, the
 notice described in Exhibit B of this License must be attached.
 
-## Exhibit A - Source Code Form License Notice
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE
@@ -384,7 +374,8 @@ for such a notice.
 
 You may add additional accurate notices of copyright ownership.
 
-## Exhibit B - "Incompatible With Secondary Licenses" Notice
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
 
-This Source Code Form is "Incompatible With Secondary Licenses", as
-defined by the Mozilla Public License, v. 2.0.
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

package/dist/actions/__tests__/action-test-utils.d.ts

@@ -1,5 +1,6 @@
 import type { ProjectDefinitionInput, SchemaParserContext } from '@baseplate-dev/project-builder-lib';
-import type { ServiceActionContext } from '#src/actions/types.js';
+import type z from 'zod';
+import type { ServiceAction, ServiceActionContext } from '#src/actions/types.js';
 import type { EntityServiceContextResult } from '../definition/load-entity-service-context.js';
 /**
  * Creates a minimal ServiceActionContext for testing.
@@ -21,4 +22,9 @@ export interface TestEntityServiceContextResult extends EntityServiceContextResu
     parserContext: SchemaParserContext;
 }
 export declare function createTestEntityServiceContext(input?: Partial<ProjectDefinitionInput>): TestEntityServiceContextResult;
+/**
+ * Invokes a service action for testing, validating input/output schemas
+ * but skipping CLI output formatting.
+ */
+export declare function invokeServiceActionForTest<TInputType extends z.ZodType, TOutputType extends z.ZodType>(action: ServiceAction<TInputType, TOutputType>, input: z.input<TInputType>, context: ServiceActionContext): Promise<z.output<TOutputType>>;
 //# sourceMappingURL=action-test-utils.d.ts.map

package/dist/actions/__tests__/action-test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-test-utils.d.ts","sourceRoot":"","sources":["../../../src/actions/__tests__/action-test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAK5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAE/F;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,oBAAoB,CAAM,GAC5C,oBAAoB,CAkBtB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,8BAA+B,SAAQ,0BAA0B;IAChF,aAAa,EAAE,mBAAmB,CAAC;CACpC;AAED,wBAAgB,8BAA8B,CAC5C,KAAK,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC1C,8BAA8B,CAIhC"}
+{"version":3,"file":"action-test-utils.d.ts","sourceRoot":"","sources":["../../../src/actions/__tests__/action-test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAKzB,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAE/F;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,oBAAoB,CAAM,GAC5C,oBAAoB,CAkBtB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,8BAA+B,SAAQ,0BAA0B;IAChF,aAAa,EAAE,mBAAmB,CAAC;CACpC;AAED,wBAAgB,8BAA8B,CAC5C,KAAK,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC1C,8BAA8B,CAIhC;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,SAAS,CAAC,CAAC,OAAO,EAC5B,WAAW,SAAS,CAAC,CAAC,OAAO,EAE7B,MAAM,EAAE,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,EAC9C,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAIhC"}

package/dist/actions/__tests__/action-test-utils.js

@@ -30,4 +30,13 @@ export function createTestEntityServiceContext(input = {}) {
     const entityContext = container.toEntityServiceContext();
     return { entityContext, container, parserContext: container.parserContext };
 }
+/**
+ * Invokes a service action for testing, validating input/output schemas
+ * but skipping CLI output formatting.
+ */
+export async function invokeServiceActionForTest(action, input, context) {
+    const parsedInput = action.inputSchema.parse(input);
+    const result = await action.handler(parsedInput, context);
+    return action.outputSchema.parse(result);
+}
 //# sourceMappingURL=action-test-utils.js.map

package/dist/actions/__tests__/action-test-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-test-utils.js","sourceRoot":"","sources":["../../../src/actions/__tests__/action-test-utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oCAAoC,EAAE,MAAM,4CAA4C,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAM1D;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,YAA2C,EAAE;IAE7C,OAAO;QACL,QAAQ,EAAE;YACR;gBACE,EAAE,EAAE,cAAc;gBAClB,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,eAAe;gBAC1B,kBAAkB,EAAE,yBAAyB;gBAC7C,IAAI,EAAE,MAAM;aACb;SACF;QACD,OAAO,EAAE,EAAE;QACX,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;QACnC,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,SAAS;QACpB,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAeD,MAAM,UAAU,8BAA8B,CAC5C,QAAyC,EAAE;IAE3C,MAAM,SAAS,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,SAAS,CAAC,sBAAsB,EAAE,CAAC;IACzD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,EAAE,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"action-test-utils.js","sourceRoot":"","sources":["../../../src/actions/__tests__/action-test-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oCAAoC,EAAE,MAAM,4CAA4C,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAS1D;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,YAA2C,EAAE;IAE7C,OAAO;QACL,QAAQ,EAAE;YACR;gBACE,EAAE,EAAE,cAAc;gBAClB,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,eAAe;gBAC1B,kBAAkB,EAAE,yBAAyB;gBAC7C,IAAI,EAAE,MAAM;aACb;SACF;QACD,OAAO,EAAE,EAAE;QACX,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;QACnC,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,SAAS;QACpB,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAeD,MAAM,UAAU,8BAA8B,CAC5C,QAAyC,EAAE;IAE3C,MAAM,SAAS,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,SAAS,CAAC,sBAAsB,EAAE,CAAC;IACzD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,EAAE,CAAC;AAC9E,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAI9C,MAA8C,EAC9C,KAA0B,EAC1B,OAA6B;IAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}

package/dist/actions/definition/apply-fix.action.d.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+export declare const applyFixAction: import("#src/actions/types.js").ServiceAction<z.ZodObject<{
+    project: z.ZodString;
+    fixId: z.ZodString;
+}, z.core.$strip>, z.ZodObject<{
+    message: z.ZodString;
+    issues: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        message: z.ZodString;
+        entityId: z.ZodOptional<z.ZodString>;
+        path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+        severity: z.ZodEnum<{
+            error: "error";
+            warning: "warning";
+        }>;
+        fixLabel: z.ZodOptional<z.ZodString>;
+        fixId: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>>;
+//# sourceMappingURL=apply-fix.action.d.ts.map

package/dist/actions/definition/apply-fix.action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-fix.action.d.ts","sourceRoot":"","sources":["../../../src/actions/definition/apply-fix.action.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8BxB,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;kBA6DzB,CAAC"}

package/dist/actions/definition/apply-fix.action.js

@@ -0,0 +1,53 @@
+import { collectDefinitionIssues, createIssueFixSetter, ProjectDefinitionContainer, serializeSchema, } from '@baseplate-dev/project-builder-lib';
+import { produce } from 'immer';
+import { z } from 'zod';
+import { createServiceAction } from '#src/actions/types.js';
+import { getOrCreateDraftSession } from './draft-session.js';
+import { definitionIssueSchema, generateFixId, mapIssueToOutput, validateAndSaveDraft, writeIssuesCliOutput, } from './validate-draft.js';
+const applyFixInputSchema = z.object({
+    project: z.string().describe('The name or ID of the project.'),
+    fixId: z
+        .string()
+        .describe('The deterministic fix ID returned by stage actions (e.g., "fix-a1b2c3d4").'),
+});
+const applyFixOutputSchema = z.object({
+    message: z.string().describe('A summary of the applied fix.'),
+    issues: z
+        .array(definitionIssueSchema)
+        .optional()
+        .describe('Remaining definition issues after applying the fix.'),
+});
+export const applyFixAction = createServiceAction({
+    name: 'apply-fix',
+    title: 'Apply Fix',
+    description: 'Apply an auto-fix for a definition issue in the current draft session.',
+    inputSchema: applyFixInputSchema,
+    outputSchema: applyFixOutputSchema,
+    handler: async (input, context) => {
+        const { session, parserContext, projectDirectory } = await getOrCreateDraftSession(input.project, context);
+        // Build container from draft definition to collect issues
+        const container = ProjectDefinitionContainer.fromSerializedConfig(session.draftDefinition, parserContext);
+        const issues = collectDefinitionIssues(container);
+        // Find the issue matching the fix ID
+        const matchingIssue = issues.find((issue) => issue.fix && generateFixId(issue) === input.fixId);
+        if (!matchingIssue) {
+            throw new Error(`No fixable issue found with ID "${input.fixId}". ` +
+                'The fix may no longer be applicable or the ID may be incorrect.');
+        }
+        const setter = createIssueFixSetter(matchingIssue, container);
+        if (!setter) {
+            throw new Error(`Issue "${matchingIssue.message}" has no applicable fix.`);
+        }
+        // Apply the fix to the parsed definition
+        const fixedDefinition = produce(setter)(container.definition);
+        // Serialize back to name-based format via the schema
+        const fixedSerializedDef = serializeSchema(container.schema, fixedDefinition);
+        const { warnings } = await validateAndSaveDraft(fixedSerializedDef, parserContext, session, projectDirectory, 'Fix applied but resulted in definition errors');
+        return {
+            message: `Applied fix: ${matchingIssue.fix?.label ?? matchingIssue.message}`,
+            issues: warnings.length > 0 ? warnings.map(mapIssueToOutput) : undefined,
+        };
+    },
+    writeCliOutput: writeIssuesCliOutput,
+});
+//# sourceMappingURL=apply-fix.action.js.map

package/dist/actions/definition/apply-fix.action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-fix.action.js","sourceRoot":"","sources":["../../../src/actions/definition/apply-fix.action.ts"],"names":[],"mappings":"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"}

package/dist/actions/definition/commit-draft.action.d.ts

@@ -11,6 +11,8 @@ export declare const commitDraftAction: import("#src/actions/types.js").ServiceA
             error: "error";
             warning: "warning";
         }>;
+        fixLabel: z.ZodOptional<z.ZodString>;
+        fixId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>>;
 }, z.core.$strip>>;
 //# sourceMappingURL=commit-draft.action.d.ts.map

package/dist/actions/definition/commit-draft.action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-draft.action.d.ts","sourceRoot":"","sources":["../../../src/actions/definition/commit-draft.action.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0BxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;kBAkE5B,CAAC"}
+{"version":3,"file":"commit-draft.action.d.ts","sourceRoot":"","sources":["../../../src/actions/definition/commit-draft.action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8BxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;kBAoE5B,CAAC"}

package/dist/actions/definition/commit-draft.action.js

@@ -1,4 +1,3 @@
-import { collectDefinitionIssues, ProjectDefinitionContainer, } from '@baseplate-dev/project-builder-lib';
 import { writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { z } from 'zod';
@@ -7,7 +6,7 @@ import { resolveBaseplateDir } from '#src/diff/snapshot/snapshot-utils.js';
 import { createNodeSchemaParserContext } from '#src/plugins/node-plugin-store.js';
 import { getProjectByNameOrId } from '../utils/projects.js';
 import { deleteDraftSession, loadDefinitionHash, loadDraftSession, } from './draft-session.js';
-import { definitionIssueSchema } from './validate-draft.js';
+import { definitionIssueSchema, fixAndValidateDraftDefinition, mapIssueToOutput, } from './validate-draft.js';
 const commitDraftInputSchema = z.object({
     project: z.string().describe('The name or ID of the project.'),
 });
@@ -36,16 +35,18 @@ export const commitDraftAction = createServiceAction({
             throw new Error('The project definition has changed since the draft was created. ' +
                 'Discard the draft with discard-draft and start over.');
         }
-        // Convert the serialized draft back to a proper definition and serialize it
+        // Convert the serialized draft back to a proper definition and validate
         const parserContext = await createNodeSchemaParserContext(project, context.logger, context.plugins, context.cliVersion);
-        const container = ProjectDefinitionContainer.fromSerializedConfig(session.draftDefinition, parserContext);
-        // Validate the draft definition before committing
-        const issues = collectDefinitionIssues(container);
-        if (issues.length > 0) {
-            const messages = issues
-                .map((i) => `[${i.severity}] ${i.message}`)
-                .join('; ');
-            throw new Error(`Commit blocked by definition issues: ${messages}`);
+        const { container, errors, warnings } = fixAndValidateDraftDefinition(session.draftDefinition, parserContext);
+        if (errors.length > 0) {
+            const messages = errors.map((e) => e.message).join('; ');
+            throw new Error(`Commit blocked by definition errors: ${messages}`);
+        }
+        if (warnings.length > 0) {
+            return {
+                message: 'Commit blocked by definition warnings.',
+                issues: warnings.map(mapIssueToOutput),
+            };
         }
         const serializedContents = container.toSerializedContents();
         // Write to project-definition.json

package/dist/actions/definition/commit-draft.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-draft.action.js","sourceRoot":"","sources":["../../../src/actions/definition/commit-draft.action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;CAC/D,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iCAAiC,CAAC;IAC/D,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,qBAAqB,CAAC;SAC5B,QAAQ,EAAE;SACV,QAAQ,CAAC,4CAA4C,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;IACnD,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,cAAc;IACrB,WAAW,EACT,sEAAsE;IACxE,WAAW,EAAE,sBAAsB;IACnC,YAAY,EAAE,uBAAuB;IACrC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,oHAAoH,CACrH,CAAC;QACJ,CAAC;QAED,mEAAmE;QACnE,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,WAAW,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,kEAAkE;gBAChE,sDAAsD,CACzD,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,MAAM,aAAa,GAAG,MAAM,6BAA6B,CACvD,OAAO,EACP,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,UAAU,CACnB,CAAC;QAEF,MAAM,SAAS,GAAG,0BAA0B,CAAC,oBAAoB,CAC/D,OAAO,CAAC,eAAe,EACvB,aAAa,CACd,CAAC;QAEF,kDAAkD;QAClD,MAAM,MAAM,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAElD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,MAAM;iBACpB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;iBAC1C,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,kBAAkB,GAAG,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAE5D,mCAAmC;QACnC,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;QAC3E,MAAM,SAAS,CAAC,eAAe,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAE9D,yBAAyB;QACzB,MAAM,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE5C,OAAO;YACL,OAAO,EAAE,0DAA0D;SACpE,CAAC;IACJ,CAAC;IACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE;QACzB,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"commit-draft.action.js","sourceRoot":"","sources":["../../../src/actions/definition/commit-draft.action.ts"],"names":[],"mappings":"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"}