opkg 0.9.2 → 0.9.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude/agents/code-reviewer.md +171 -0
- package/.claude/commands/commit-push-pr.md +20 -0
- package/.claude/commands/{specs/read.md → read-specs.md} +1 -1
- package/.claude/commands/{specs/update.md → update-specs.md} +4 -0
- package/.claude/skills/code-review-excellence/SKILL.md +538 -0
- package/README.md +2 -2
- package/package.json +3 -1
- package/packages/cli/dist/add-IJAPFHIX.js +624 -0
- package/packages/cli/dist/add-IJAPFHIX.js.map +7 -0
- package/packages/cli/dist/add-LLUNFLJI.js +624 -0
- package/packages/cli/dist/add-LLUNFLJI.js.map +7 -0
- package/packages/cli/dist/add-U44SL3OR.js +624 -0
- package/packages/cli/dist/add-U44SL3OR.js.map +7 -0
- package/packages/cli/dist/chunk-23VBP5L6.js +371 -0
- package/packages/cli/dist/chunk-23VBP5L6.js.map +7 -0
- package/packages/cli/dist/chunk-2SVHLF5C.js +1419 -0
- package/packages/cli/dist/chunk-2SVHLF5C.js.map +7 -0
- package/packages/cli/dist/chunk-37256POU.js +99 -0
- package/packages/cli/dist/chunk-37256POU.js.map +7 -0
- package/packages/cli/dist/chunk-3PZRVA6O.js +196 -0
- package/packages/cli/dist/chunk-3PZRVA6O.js.map +7 -0
- package/packages/cli/dist/chunk-427DCURL.js +155 -0
- package/packages/cli/dist/chunk-427DCURL.js.map +7 -0
- package/packages/cli/dist/chunk-4B5HJLP2.js +48 -0
- package/packages/cli/dist/chunk-4B5HJLP2.js.map +7 -0
- package/packages/cli/dist/chunk-4OWT3YEG.js +413 -0
- package/packages/cli/dist/chunk-4OWT3YEG.js.map +7 -0
- package/packages/cli/dist/chunk-4RIBTBXI.js +568 -0
- package/packages/cli/dist/chunk-4RIBTBXI.js.map +7 -0
- package/packages/cli/dist/chunk-4X2EJHJN.js +63 -0
- package/packages/cli/dist/chunk-4X2EJHJN.js.map +7 -0
- package/packages/cli/dist/chunk-6CYW66HD.js +1136 -0
- package/packages/cli/dist/chunk-6CYW66HD.js.map +7 -0
- package/packages/cli/dist/chunk-6DITYAFA.js +172 -0
- package/packages/cli/dist/chunk-6DITYAFA.js.map +7 -0
- package/packages/cli/dist/chunk-7KEAKEVZ.js +568 -0
- package/packages/cli/dist/chunk-7KEAKEVZ.js.map +7 -0
- package/packages/cli/dist/chunk-ABFUD25D.js +61 -0
- package/packages/cli/dist/chunk-ABFUD25D.js.map +7 -0
- package/packages/cli/dist/chunk-AR7GJCG6.js +274 -0
- package/packages/cli/dist/chunk-AR7GJCG6.js.map +7 -0
- package/packages/cli/dist/chunk-AYTGQCXH.js +86 -0
- package/packages/cli/dist/chunk-AYTGQCXH.js.map +7 -0
- package/packages/cli/dist/chunk-BROJ6OUT.js +631 -0
- package/packages/cli/dist/chunk-BROJ6OUT.js.map +7 -0
- package/packages/cli/dist/chunk-BVVSU7QD.js +23 -0
- package/packages/cli/dist/chunk-BVVSU7QD.js.map +7 -0
- package/packages/cli/dist/chunk-C6FY55UP.js +108 -0
- package/packages/cli/dist/chunk-C6FY55UP.js.map +7 -0
- package/packages/cli/dist/chunk-CVA64SXK.js +1136 -0
- package/packages/cli/dist/chunk-CVA64SXK.js.map +7 -0
- package/packages/cli/dist/chunk-D3O7LY2Q.js +1151 -0
- package/packages/cli/dist/chunk-D3O7LY2Q.js.map +7 -0
- package/packages/cli/dist/chunk-D6LEPODL.js +413 -0
- package/packages/cli/dist/chunk-D6LEPODL.js.map +7 -0
- package/packages/cli/dist/chunk-DEC24S7E.js +186 -0
- package/packages/cli/dist/chunk-DEC24S7E.js.map +7 -0
- package/packages/cli/dist/chunk-FMVVJH5M.js +371 -0
- package/packages/cli/dist/chunk-FMVVJH5M.js.map +7 -0
- package/packages/cli/dist/chunk-GDVFS3YP.js +130 -0
- package/packages/cli/dist/chunk-GDVFS3YP.js.map +7 -0
- package/packages/cli/dist/chunk-GEP2G5HF.js +31 -0
- package/packages/cli/dist/chunk-GEP2G5HF.js.map +7 -0
- package/packages/cli/dist/chunk-GSWHZBT2.js +62 -0
- package/packages/cli/dist/chunk-GSWHZBT2.js.map +7 -0
- package/packages/cli/dist/chunk-HTYHJA3B.js +61 -0
- package/packages/cli/dist/chunk-HTYHJA3B.js.map +7 -0
- package/packages/cli/dist/chunk-HYKYECAE.js +222 -0
- package/packages/cli/dist/chunk-HYKYECAE.js.map +7 -0
- package/packages/cli/dist/chunk-I7FEAHB4.js +100 -0
- package/packages/cli/dist/chunk-I7FEAHB4.js.map +7 -0
- package/packages/cli/dist/chunk-IHVZ5AUJ.js +107 -0
- package/packages/cli/dist/chunk-IHVZ5AUJ.js.map +7 -0
- package/packages/cli/dist/chunk-KI7FDU3H.js +99 -0
- package/packages/cli/dist/chunk-KI7FDU3H.js.map +7 -0
- package/packages/cli/dist/chunk-L5GRJQBS.js +32 -0
- package/packages/cli/dist/chunk-L5GRJQBS.js.map +7 -0
- package/packages/cli/dist/chunk-LHEAUDJL.js +302 -0
- package/packages/cli/dist/chunk-LHEAUDJL.js.map +7 -0
- package/packages/cli/dist/chunk-MIURCESJ.js +48 -0
- package/packages/cli/dist/chunk-MIURCESJ.js.map +7 -0
- package/packages/cli/dist/chunk-N43IXOND.js +732 -0
- package/packages/cli/dist/chunk-N43IXOND.js.map +7 -0
- package/packages/cli/dist/chunk-OUZRMGPV.js +274 -0
- package/packages/cli/dist/chunk-OUZRMGPV.js.map +7 -0
- package/packages/cli/dist/chunk-PSQXKAL4.js +371 -0
- package/packages/cli/dist/chunk-PSQXKAL4.js.map +7 -0
- package/packages/cli/dist/chunk-PUDRKDVZ.js +1419 -0
- package/packages/cli/dist/chunk-PUDRKDVZ.js.map +7 -0
- package/packages/cli/dist/chunk-RAKMX654.js +631 -0
- package/packages/cli/dist/chunk-RAKMX654.js.map +7 -0
- package/packages/cli/dist/chunk-RSFLK2TP.js +195 -0
- package/packages/cli/dist/chunk-RSFLK2TP.js.map +7 -0
- package/packages/cli/dist/chunk-S26PR2BS.js +99 -0
- package/packages/cli/dist/chunk-S26PR2BS.js.map +7 -0
- package/packages/cli/dist/chunk-U7FW7SXX.js +568 -0
- package/packages/cli/dist/chunk-U7FW7SXX.js.map +7 -0
- package/packages/cli/dist/chunk-VKM6K5TN.js +413 -0
- package/packages/cli/dist/chunk-VKM6K5TN.js.map +7 -0
- package/packages/cli/dist/chunk-VKNJG4JN.js +253 -0
- package/packages/cli/dist/chunk-VKNJG4JN.js.map +7 -0
- package/packages/cli/dist/chunk-VQ2KY6CK.js +113 -0
- package/packages/cli/dist/chunk-VQ2KY6CK.js.map +7 -0
- package/packages/cli/dist/chunk-VQDTXLOX.js +1312 -0
- package/packages/cli/dist/chunk-VQDTXLOX.js.map +7 -0
- package/packages/cli/dist/chunk-VXNS3X5O.js +60 -0
- package/packages/cli/dist/chunk-VXNS3X5O.js.map +7 -0
- package/packages/cli/dist/chunk-WF7H2YDU.js +376 -0
- package/packages/cli/dist/chunk-WF7H2YDU.js.map +7 -0
- package/packages/cli/dist/chunk-WNRXZLWW.js +266 -0
- package/packages/cli/dist/chunk-WNRXZLWW.js.map +7 -0
- package/packages/cli/dist/chunk-WT4VVCXM.js +1121 -0
- package/packages/cli/dist/chunk-WT4VVCXM.js.map +7 -0
- package/packages/cli/dist/configure-3AZUMDJZ.js +107 -0
- package/packages/cli/dist/configure-3AZUMDJZ.js.map +7 -0
- package/packages/cli/dist/configure-D722JQOD.js +107 -0
- package/packages/cli/dist/configure-D722JQOD.js.map +7 -0
- package/packages/cli/dist/configure-IU5H7XD6.js +107 -0
- package/packages/cli/dist/configure-IU5H7XD6.js.map +7 -0
- package/packages/cli/dist/file-format-detector-PXCIAKTK.js +22 -0
- package/packages/cli/dist/file-format-detector-PXCIAKTK.js.map +7 -0
- package/packages/cli/dist/index.js +17 -17
- package/packages/cli/dist/install-EZNWMLJR.js +7581 -0
- package/packages/cli/dist/install-EZNWMLJR.js.map +7 -0
- package/packages/cli/dist/install-F5ANFUBX.js +7577 -0
- package/packages/cli/dist/install-F5ANFUBX.js.map +7 -0
- package/packages/cli/dist/install-JSXEPPC2.js +7104 -0
- package/packages/cli/dist/install-JSXEPPC2.js.map +7 -0
- package/packages/cli/dist/install-QHEBX7JH.js +7101 -0
- package/packages/cli/dist/install-QHEBX7JH.js.map +7 -0
- package/packages/cli/dist/list-DMOUATYI.js +327 -0
- package/packages/cli/dist/list-DMOUATYI.js.map +7 -0
- package/packages/cli/dist/list-UESSCB7Y.js +327 -0
- package/packages/cli/dist/list-UESSCB7Y.js.map +7 -0
- package/packages/cli/dist/list-XR7RSJFS.js +327 -0
- package/packages/cli/dist/list-XR7RSJFS.js.map +7 -0
- package/packages/cli/dist/login-EYZ2SOYZ.js +150 -0
- package/packages/cli/dist/login-EYZ2SOYZ.js.map +7 -0
- package/packages/cli/dist/login-JWCSTAEU.js +150 -0
- package/packages/cli/dist/login-JWCSTAEU.js.map +7 -0
- package/packages/cli/dist/login-NRKHXZKM.js +150 -0
- package/packages/cli/dist/login-NRKHXZKM.js.map +7 -0
- package/packages/cli/dist/logout-HDMYRXIE.js +40 -0
- package/packages/cli/dist/logout-HDMYRXIE.js.map +7 -0
- package/packages/cli/dist/logout-SYHXCVCQ.js +40 -0
- package/packages/cli/dist/logout-SYHXCVCQ.js.map +7 -0
- package/packages/cli/dist/logout-X3XUUOH5.js +40 -0
- package/packages/cli/dist/logout-X3XUUOH5.js.map +7 -0
- package/packages/cli/dist/new-3LTFKDTQ.js +277 -0
- package/packages/cli/dist/new-3LTFKDTQ.js.map +7 -0
- package/packages/cli/dist/new-F46OSD72.js +277 -0
- package/packages/cli/dist/new-F46OSD72.js.map +7 -0
- package/packages/cli/dist/new-OPCCLNL2.js +277 -0
- package/packages/cli/dist/new-OPCCLNL2.js.map +7 -0
- package/packages/cli/dist/package-marker-detector-T5O5YD2E.js +80 -0
- package/packages/cli/dist/package-marker-detector-T5O5YD2E.js.map +7 -0
- package/packages/cli/dist/package-yml-QWZIJDYU.js +16 -0
- package/packages/cli/dist/package-yml-QWZIJDYU.js.map +7 -0
- package/packages/cli/dist/plugin-naming-YP2I4NPA.js +29 -0
- package/packages/cli/dist/plugin-naming-YP2I4NPA.js.map +7 -0
- package/packages/cli/dist/publish-4H43PCSG.js +619 -0
- package/packages/cli/dist/publish-4H43PCSG.js.map +7 -0
- package/packages/cli/dist/publish-RULKLNUX.js +619 -0
- package/packages/cli/dist/publish-RULKLNUX.js.map +7 -0
- package/packages/cli/dist/publish-URWY2P3E.js +619 -0
- package/packages/cli/dist/publish-URWY2P3E.js.map +7 -0
- package/packages/cli/dist/remove-BD52BHR2.js +542 -0
- package/packages/cli/dist/remove-BD52BHR2.js.map +7 -0
- package/packages/cli/dist/remove-G5NRC7LD.js +542 -0
- package/packages/cli/dist/remove-G5NRC7LD.js.map +7 -0
- package/packages/cli/dist/remove-TC3FQUYQ.js +542 -0
- package/packages/cli/dist/remove-TC3FQUYQ.js.map +7 -0
- package/packages/cli/dist/resource-discoverer-4X4RY43E.js +17 -0
- package/packages/cli/dist/resource-discoverer-4X4RY43E.js.map +7 -0
- package/packages/cli/dist/save-24TESYKI.js +1728 -0
- package/packages/cli/dist/save-24TESYKI.js.map +7 -0
- package/packages/cli/dist/save-N3QWF2WN.js +1728 -0
- package/packages/cli/dist/save-N3QWF2WN.js.map +7 -0
- package/packages/cli/dist/save-P2U67DTV.js +1728 -0
- package/packages/cli/dist/save-P2U67DTV.js.map +7 -0
- package/packages/cli/dist/search-ABROK3UO.js +157 -0
- package/packages/cli/dist/search-ABROK3UO.js.map +7 -0
- package/packages/cli/dist/search-WVFXFNAV.js +157 -0
- package/packages/cli/dist/search-WVFXFNAV.js.map +7 -0
- package/packages/cli/dist/search-YQN2Q2SO.js +157 -0
- package/packages/cli/dist/search-YQN2Q2SO.js.map +7 -0
- package/packages/cli/dist/set-DCWF73F6.js +251 -0
- package/packages/cli/dist/set-DCWF73F6.js.map +7 -0
- package/packages/cli/dist/set-GJEG2F6Y.js +251 -0
- package/packages/cli/dist/set-GJEG2F6Y.js.map +7 -0
- package/packages/cli/dist/set-NGM2FIKF.js +251 -0
- package/packages/cli/dist/set-NGM2FIKF.js.map +7 -0
- package/packages/cli/dist/uninstall-3CJQMTYH.js +539 -0
- package/packages/cli/dist/uninstall-3CJQMTYH.js.map +7 -0
- package/packages/cli/dist/uninstall-Q3CP4UN5.js +539 -0
- package/packages/cli/dist/uninstall-Q3CP4UN5.js.map +7 -0
- package/packages/cli/dist/uninstall-QU5OMEEC.js +539 -0
- package/packages/cli/dist/uninstall-QU5OMEEC.js.map +7 -0
- package/packages/cli/dist/unpublish-GHJQYC4S.js +245 -0
- package/packages/cli/dist/unpublish-GHJQYC4S.js.map +7 -0
- package/packages/cli/dist/unpublish-L2CYMK4B.js +245 -0
- package/packages/cli/dist/unpublish-L2CYMK4B.js.map +7 -0
- package/packages/cli/dist/unpublish-VBTNTMS5.js +245 -0
- package/packages/cli/dist/unpublish-VBTNTMS5.js.map +7 -0
- package/packages/cli/dist/view-MXRBMXOG.js +488 -0
- package/packages/cli/dist/view-MXRBMXOG.js.map +7 -0
- package/packages/cli/dist/view-NMND7SAW.js +488 -0
- package/packages/cli/dist/view-NMND7SAW.js.map +7 -0
- package/packages/cli/dist/view-RPQRDSYB.js +488 -0
- package/packages/cli/dist/view-RPQRDSYB.js.map +7 -0
- package/packages/cli/package.json +2 -0
- package/packages/core/dist/constants/index.d.ts +9 -0
- package/packages/core/dist/constants/index.d.ts.map +1 -1
- package/packages/core/dist/constants/index.js +12 -0
- package/packages/core/dist/constants/index.js.map +1 -1
- package/packages/core/dist/core/dependency-resolver/index.d.ts +2 -10
- package/packages/core/dist/core/dependency-resolver/index.d.ts.map +1 -1
- package/packages/core/dist/core/dependency-resolver/index.js +3 -14
- package/packages/core/dist/core/dependency-resolver/index.js.map +1 -1
- package/packages/core/dist/core/install/base-detector.d.ts +2 -1
- package/packages/core/dist/core/install/base-detector.d.ts.map +1 -1
- package/packages/core/dist/core/install/base-detector.js +54 -1
- package/packages/core/dist/core/install/base-detector.js.map +1 -1
- package/packages/core/dist/core/install/conflicts/file-conflict-resolver.d.ts +7 -5
- package/packages/core/dist/core/install/conflicts/file-conflict-resolver.d.ts.map +1 -1
- package/packages/core/dist/core/install/conflicts/file-conflict-resolver.js +25 -9
- package/packages/core/dist/core/install/conflicts/file-conflict-resolver.js.map +1 -1
- package/packages/core/dist/core/install/flow-index-installer.d.ts +2 -1
- package/packages/core/dist/core/install/flow-index-installer.d.ts.map +1 -1
- package/packages/core/dist/core/install/flow-index-installer.js +19 -4
- package/packages/core/dist/core/install/flow-index-installer.js.map +1 -1
- package/packages/core/dist/core/install/input-classifier-base.js +3 -3
- package/packages/core/dist/core/install/input-classifier-base.js.map +1 -1
- package/packages/core/dist/core/install/install-reporting.d.ts.map +1 -1
- package/packages/core/dist/core/install/install-reporting.js +7 -9
- package/packages/core/dist/core/install/install-reporting.js.map +1 -1
- package/packages/core/dist/core/install/list-handler.d.ts.map +1 -1
- package/packages/core/dist/core/install/list-handler.js +3 -0
- package/packages/core/dist/core/install/list-handler.js.map +1 -1
- package/packages/core/dist/core/install/marketplace-handler.d.ts.map +1 -1
- package/packages/core/dist/core/install/marketplace-handler.js.map +1 -1
- package/packages/core/dist/core/install/operations/conflict-handler.d.ts +2 -1
- package/packages/core/dist/core/install/operations/conflict-handler.d.ts.map +1 -1
- package/packages/core/dist/core/install/operations/conflict-handler.js +2 -2
- package/packages/core/dist/core/install/operations/conflict-handler.js.map +1 -1
- package/packages/core/dist/core/install/operations/installation-executor.d.ts +3 -0
- package/packages/core/dist/core/install/operations/installation-executor.d.ts.map +1 -1
- package/packages/core/dist/core/install/operations/installation-executor.js +39 -22
- package/packages/core/dist/core/install/operations/installation-executor.js.map +1 -1
- package/packages/core/dist/core/install/orchestrator/orchestrator.d.ts +7 -3
- package/packages/core/dist/core/install/orchestrator/orchestrator.d.ts.map +1 -1
- package/packages/core/dist/core/install/orchestrator/orchestrator.js +193 -93
- package/packages/core/dist/core/install/orchestrator/orchestrator.js.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/git-strategy.d.ts +1 -0
- package/packages/core/dist/core/install/orchestrator/strategies/git-strategy.d.ts.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/git-strategy.js +11 -24
- package/packages/core/dist/core/install/orchestrator/strategies/git-strategy.js.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/path-strategy.d.ts +2 -0
- package/packages/core/dist/core/install/orchestrator/strategies/path-strategy.d.ts.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/path-strategy.js +14 -14
- package/packages/core/dist/core/install/orchestrator/strategies/path-strategy.js.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/registry-strategy.d.ts +7 -0
- package/packages/core/dist/core/install/orchestrator/strategies/registry-strategy.d.ts.map +1 -1
- package/packages/core/dist/core/install/orchestrator/strategies/registry-strategy.js +28 -0
- package/packages/core/dist/core/install/orchestrator/strategies/registry-strategy.js.map +1 -1
- package/packages/core/dist/core/install/orchestrator/types.d.ts +2 -0
- package/packages/core/dist/core/install/orchestrator/types.d.ts.map +1 -1
- package/packages/core/dist/core/install/path-package-loader.d.ts.map +1 -1
- package/packages/core/dist/core/install/path-package-loader.js +20 -1
- package/packages/core/dist/core/install/path-package-loader.js.map +1 -1
- package/packages/core/dist/core/install/platform-resolution.d.ts +3 -0
- package/packages/core/dist/core/install/platform-resolution.d.ts.map +1 -1
- package/packages/core/dist/core/install/platform-resolution.js +5 -2
- package/packages/core/dist/core/install/platform-resolution.js.map +1 -1
- package/packages/core/dist/core/install/preprocessing/context-population.d.ts +18 -0
- package/packages/core/dist/core/install/preprocessing/context-population.d.ts.map +1 -0
- package/packages/core/dist/core/install/preprocessing/context-population.js +36 -0
- package/packages/core/dist/core/install/preprocessing/context-population.js.map +1 -0
- package/packages/core/dist/core/install/preprocessing/convenience-preprocessor.d.ts +23 -0
- package/packages/core/dist/core/install/preprocessing/convenience-preprocessor.d.ts.map +1 -1
- package/packages/core/dist/core/install/preprocessing/convenience-preprocessor.js +44 -0
- package/packages/core/dist/core/install/preprocessing/convenience-preprocessor.js.map +1 -1
- package/packages/core/dist/core/install/sources/git-source.d.ts.map +1 -1
- package/packages/core/dist/core/install/sources/git-source.js +67 -4
- package/packages/core/dist/core/install/sources/git-source.js.map +1 -1
- package/packages/core/dist/core/install/sources/path-source.d.ts.map +1 -1
- package/packages/core/dist/core/install/sources/path-source.js +8 -0
- package/packages/core/dist/core/install/sources/path-source.js.map +1 -1
- package/packages/core/dist/core/install/strategies/flow-based-strategy.d.ts.map +1 -1
- package/packages/core/dist/core/install/strategies/flow-based-strategy.js +12 -5
- package/packages/core/dist/core/install/strategies/flow-based-strategy.js.map +1 -1
- package/packages/core/dist/core/install/strategies/types.d.ts +11 -1
- package/packages/core/dist/core/install/strategies/types.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/context-builders.d.ts +5 -0
- package/packages/core/dist/core/install/unified/context-builders.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/context-builders.js +12 -0
- package/packages/core/dist/core/install/unified/context-builders.js.map +1 -1
- package/packages/core/dist/core/install/unified/context-helpers.d.ts +0 -4
- package/packages/core/dist/core/install/unified/context-helpers.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/context-helpers.js +0 -24
- package/packages/core/dist/core/install/unified/context-helpers.js.map +1 -1
- package/packages/core/dist/core/install/unified/index.d.ts +1 -1
- package/packages/core/dist/core/install/unified/index.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/index.js +1 -1
- package/packages/core/dist/core/install/unified/index.js.map +1 -1
- package/packages/core/dist/core/install/unified/multi-context-pipeline.d.ts +6 -0
- package/packages/core/dist/core/install/unified/multi-context-pipeline.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/multi-context-pipeline.js +11 -4
- package/packages/core/dist/core/install/unified/multi-context-pipeline.js.map +1 -1
- package/packages/core/dist/core/install/unified/phases/conflicts.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/phases/conflicts.js +1 -1
- package/packages/core/dist/core/install/unified/phases/conflicts.js.map +1 -1
- package/packages/core/dist/core/install/unified/phases/execute.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/phases/execute.js +5 -5
- package/packages/core/dist/core/install/unified/phases/execute.js.map +1 -1
- package/packages/core/dist/core/install/unified/phases/load-package.js +3 -3
- package/packages/core/dist/core/install/unified/phases/load-package.js.map +1 -1
- package/packages/core/dist/core/install/unified/phases/report.js +1 -1
- package/packages/core/dist/core/install/unified/phases/report.js.map +1 -1
- package/packages/core/dist/core/install/unified/pipeline.d.ts.map +1 -1
- package/packages/core/dist/core/install/unified/pipeline.js +7 -10
- package/packages/core/dist/core/install/unified/pipeline.js.map +1 -1
- package/packages/core/dist/core/install/wave-resolver/content-root-cache.d.ts +24 -0
- package/packages/core/dist/core/install/wave-resolver/content-root-cache.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/content-root-cache.js +71 -0
- package/packages/core/dist/core/install/wave-resolver/content-root-cache.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/context-builder.d.ts +39 -0
- package/packages/core/dist/core/install/wave-resolver/context-builder.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/context-builder.js +148 -0
- package/packages/core/dist/core/install/wave-resolver/context-builder.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/fetcher.d.ts +49 -0
- package/packages/core/dist/core/install/wave-resolver/fetcher.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/fetcher.js +221 -0
- package/packages/core/dist/core/install/wave-resolver/fetcher.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index-updater.d.ts +23 -0
- package/packages/core/dist/core/install/wave-resolver/index-updater.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index-updater.js +87 -0
- package/packages/core/dist/core/install/wave-resolver/index-updater.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index-write-collector.d.ts +101 -0
- package/packages/core/dist/core/install/wave-resolver/index-write-collector.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index-write-collector.js +194 -0
- package/packages/core/dist/core/install/wave-resolver/index-write-collector.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index.d.ts +17 -0
- package/packages/core/dist/core/install/wave-resolver/index.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/index.js +16 -0
- package/packages/core/dist/core/install/wave-resolver/index.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/manifest-reader.d.ts +34 -0
- package/packages/core/dist/core/install/wave-resolver/manifest-reader.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/manifest-reader.js +112 -0
- package/packages/core/dist/core/install/wave-resolver/manifest-reader.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/types.d.ts +210 -0
- package/packages/core/dist/core/install/wave-resolver/types.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/types.js +6 -0
- package/packages/core/dist/core/install/wave-resolver/types.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/version-solver.d.ts +65 -0
- package/packages/core/dist/core/install/wave-resolver/version-solver.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/version-solver.js +166 -0
- package/packages/core/dist/core/install/wave-resolver/version-solver.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/wave-engine.d.ts +16 -0
- package/packages/core/dist/core/install/wave-resolver/wave-engine.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/wave-engine.js +337 -0
- package/packages/core/dist/core/install/wave-resolver/wave-engine.js.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/wave-installer.d.ts +50 -0
- package/packages/core/dist/core/install/wave-resolver/wave-installer.d.ts.map +1 -0
- package/packages/core/dist/core/install/wave-resolver/wave-installer.js +246 -0
- package/packages/core/dist/core/install/wave-resolver/wave-installer.js.map +1 -0
- package/packages/core/dist/core/ports/buffered-output.d.ts +36 -0
- package/packages/core/dist/core/ports/buffered-output.d.ts.map +1 -0
- package/packages/core/dist/core/ports/buffered-output.js +89 -0
- package/packages/core/dist/core/ports/buffered-output.js.map +1 -0
- package/packages/core/dist/core/ports/resolve.d.ts +0 -13
- package/packages/core/dist/core/ports/resolve.d.ts.map +1 -1
- package/packages/core/dist/core/ports/resolve.js +0 -28
- package/packages/core/dist/core/ports/resolve.js.map +1 -1
- package/packages/core/dist/core/remove/removal-confirmation.d.ts +4 -1
- package/packages/core/dist/core/remove/removal-confirmation.d.ts.map +1 -1
- package/packages/core/dist/core/remove/removal-confirmation.js +5 -4
- package/packages/core/dist/core/remove/removal-confirmation.js.map +1 -1
- package/packages/core/dist/core/remove/remove-from-source-pipeline.d.ts.map +1 -1
- package/packages/core/dist/core/remove/remove-from-source-pipeline.js +1 -10
- package/packages/core/dist/core/remove/remove-from-source-pipeline.js.map +1 -1
- package/packages/core/dist/core/uninstall/uninstall-executor.js +1 -1
- package/packages/core/dist/core/uninstall/uninstall-executor.js.map +1 -1
- package/packages/core/dist/core/uninstall/uninstall-reporter.d.ts +2 -2
- package/packages/core/dist/core/uninstall/uninstall-reporter.d.ts.map +1 -1
- package/packages/core/dist/core/uninstall/uninstall-reporter.js +4 -4
- package/packages/core/dist/core/uninstall/uninstall-reporter.js.map +1 -1
- package/packages/core/dist/index.d.ts +1 -1
- package/packages/core/dist/index.d.ts.map +1 -1
- package/packages/core/dist/types/execution-context.d.ts +40 -10
- package/packages/core/dist/types/execution-context.d.ts.map +1 -1
- package/packages/core/dist/utils/concurrency-pool.d.ts +34 -0
- package/packages/core/dist/utils/concurrency-pool.d.ts.map +1 -0
- package/packages/core/dist/utils/concurrency-pool.js +58 -0
- package/packages/core/dist/utils/concurrency-pool.js.map +1 -0
- package/packages/core/dist/utils/plugin-naming.d.ts +11 -3
- package/packages/core/dist/utils/plugin-naming.d.ts.map +1 -1
- package/packages/core/dist/utils/plugin-naming.js +27 -7
- package/packages/core/dist/utils/plugin-naming.js.map +1 -1
- package/plans/wave-resolver.md +254 -0
- package/.claude/agents/essentials/code-simplifier.md +0 -52
- package/.claude/commands/essentials/cleanup.md +0 -1
- package/.claude/commands/essentials/review.md +0 -8
- package/.claude/commands/git/commit.md +0 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Modular dependency resolver
|
|
3
3
|
*
|
|
4
|
-
* This module provides
|
|
4
|
+
* This module provides shared types for dependency resolution:
|
|
5
5
|
* - types.ts: Type definitions (ResolvedPackage, DependencyNode)
|
|
6
|
-
* - tree-utils.ts: Tree-related utilities for uninstall operations
|
|
7
|
-
* - display.ts: Display utilities for showing dependency trees
|
|
8
|
-
* - prompts.ts: Interactive prompt utilities
|
|
9
|
-
* - resolver.ts: Legacy recursive resolver (deprecated, use DependencyResolutionExecutor)
|
|
10
6
|
*
|
|
11
7
|
* For recursive dependency resolution in install commands, use:
|
|
12
|
-
* -
|
|
8
|
+
* - resolveWave() from '../install/wave-resolver/index.js'
|
|
13
9
|
*/
|
|
14
10
|
export type { ResolvedPackage, DependencyNode } from './types.js';
|
|
15
|
-
export { buildDependencyTree, getAllDependencies, findDanglingDependencies } from './tree-utils.js';
|
|
16
|
-
export { displayDependencyTree } from './display.js';
|
|
17
|
-
export { promptOverwrite } from './prompts.js';
|
|
18
|
-
export { resolveDependencies, type ResolveDependenciesResult } from './resolver.js';
|
|
19
11
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/dependency-resolver/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/dependency-resolver/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -1,22 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Modular dependency resolver
|
|
3
3
|
*
|
|
4
|
-
* This module provides
|
|
4
|
+
* This module provides shared types for dependency resolution:
|
|
5
5
|
* - types.ts: Type definitions (ResolvedPackage, DependencyNode)
|
|
6
|
-
* - tree-utils.ts: Tree-related utilities for uninstall operations
|
|
7
|
-
* - display.ts: Display utilities for showing dependency trees
|
|
8
|
-
* - prompts.ts: Interactive prompt utilities
|
|
9
|
-
* - resolver.ts: Legacy recursive resolver (deprecated, use DependencyResolutionExecutor)
|
|
10
6
|
*
|
|
11
7
|
* For recursive dependency resolution in install commands, use:
|
|
12
|
-
* -
|
|
8
|
+
* - resolveWave() from '../install/wave-resolver/index.js'
|
|
13
9
|
*/
|
|
14
|
-
|
|
15
|
-
export { buildDependencyTree, getAllDependencies, findDanglingDependencies } from './tree-utils.js';
|
|
16
|
-
// Display utilities
|
|
17
|
-
export { displayDependencyTree } from './display.js';
|
|
18
|
-
// Prompt utilities
|
|
19
|
-
export { promptOverwrite } from './prompts.js';
|
|
20
|
-
// Legacy resolver (still used by unified pipeline)
|
|
21
|
-
export { resolveDependencies } from './resolver.js';
|
|
10
|
+
export {};
|
|
22
11
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/dependency-resolver/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/dependency-resolver/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* 2. .claude-plugin/marketplace.json at resource root (triggers selection flow)
|
|
10
10
|
* 3. .claude-plugin/plugin.json at resource root
|
|
11
11
|
* 4. Pattern matching against platforms.jsonc (deepest match)
|
|
12
|
+
* 5. Resource-direct resolution (explicit resourcePath exists on disk)
|
|
12
13
|
*/
|
|
13
14
|
/**
|
|
14
15
|
* Result of base detection
|
|
@@ -19,7 +20,7 @@ export interface BaseDetectionResult {
|
|
|
19
20
|
/** The from pattern that matched (for pattern-based detection) */
|
|
20
21
|
matchedPattern?: string;
|
|
21
22
|
/** How the base was determined */
|
|
22
|
-
matchType: 'openpackage' | 'marketplace' | 'plugin' | 'pattern' | 'ambiguous' | 'none';
|
|
23
|
+
matchType: 'openpackage' | 'marketplace' | 'plugin' | 'pattern' | 'ambiguous' | 'resource-direct' | 'none';
|
|
23
24
|
/** For ambiguous cases, all possible matches */
|
|
24
25
|
ambiguousMatches?: Array<{
|
|
25
26
|
pattern: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-detector.d.ts","sourceRoot":"","sources":["../../../src/core/install/base-detector.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"base-detector.d.ts","sourceRoot":"","sources":["../../../src/core/install/base-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAUH;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,6DAA6D;IAC7D,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzB,kEAAkE;IAClE,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,kCAAkC;IAClC,SAAS,EACL,aAAa,GACb,aAAa,GACb,QAAQ,GACR,SAAS,GACT,WAAW,GACX,iBAAiB,GACjB,MAAM,CAAC;IAEX,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,KAAK,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IAEH,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,GAAG,GACnB,OAAO,CAAC,mBAAmB,CAAC,CA8K9B;AAmED;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,GAAG,GACnB,OAAO,CAAC,mBAAmB,CAAC,CAuB9B"}
|
|
@@ -9,12 +9,14 @@
|
|
|
9
9
|
* 2. .claude-plugin/marketplace.json at resource root (triggers selection flow)
|
|
10
10
|
* 3. .claude-plugin/plugin.json at resource root
|
|
11
11
|
* 4. Pattern matching against platforms.jsonc (deepest match)
|
|
12
|
+
* 5. Resource-direct resolution (explicit resourcePath exists on disk)
|
|
12
13
|
*/
|
|
13
14
|
import { join, resolve, dirname, relative, isAbsolute, sep } from 'path';
|
|
14
15
|
import { exists, readTextFile } from '../../utils/fs.js';
|
|
15
16
|
import { extractAllFromPatterns, findDeepestMatch } from '../../utils/pattern-matcher.js';
|
|
16
17
|
import { logger } from '../../utils/logger.js';
|
|
17
18
|
import { FILE_PATTERNS, CLAUDE_PLUGIN_PATHS } from '../../constants/index.js';
|
|
19
|
+
import { normalizePluginSource } from './plugin-sources.js';
|
|
18
20
|
import { stat } from 'fs/promises';
|
|
19
21
|
/**
|
|
20
22
|
* Detect the base directory for a resource.
|
|
@@ -90,6 +92,7 @@ export async function detectBase(resourcePath, repoRoot, platformsConfig) {
|
|
|
90
92
|
// Marketplace-aware plugin base inference:
|
|
91
93
|
// If this repo is a Claude marketplace AND the user provided a file/dir resource path within it,
|
|
92
94
|
// try to resolve the plugin base from marketplace.json plugin entries (e.g. "./plugins/unit-testing").
|
|
95
|
+
// Handles both string sources ("./path") and object sources ({ source: 'github', ... }).
|
|
93
96
|
if (marketplaceRoot && resourcePath && !isAbsolute(resourcePath)) {
|
|
94
97
|
try {
|
|
95
98
|
const raw = await readTextFile(marketplaceRoot.manifestPath);
|
|
@@ -100,7 +103,31 @@ export async function detectBase(resourcePath, repoRoot, platformsConfig) {
|
|
|
100
103
|
let bestMatch = null;
|
|
101
104
|
for (const p of plugins) {
|
|
102
105
|
const source = p?.source;
|
|
103
|
-
|
|
106
|
+
if (!source)
|
|
107
|
+
continue;
|
|
108
|
+
// Extract relative path from any source format (string or PluginSourceObject)
|
|
109
|
+
let relRaw;
|
|
110
|
+
if (typeof source === 'string') {
|
|
111
|
+
relRaw = source;
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
// Handle PluginSourceObject ({ source: 'github', ... } or { source: 'url', ... })
|
|
115
|
+
// These point to external repos and have an optional `path` field for subdirectory.
|
|
116
|
+
// For local marketplace inference, only the `path` field is meaningful as a relative
|
|
117
|
+
// location within the marketplace repo. If there's no `path`, this entry points to
|
|
118
|
+
// an external repo root and can't be matched against a local resourcePath.
|
|
119
|
+
try {
|
|
120
|
+
const normalized = normalizePluginSource(source, p?.name || 'unknown');
|
|
121
|
+
if (normalized.type === 'relative-path') {
|
|
122
|
+
relRaw = normalized.relativePath;
|
|
123
|
+
}
|
|
124
|
+
// Git-type sources (github/url) reference external repos, not local paths.
|
|
125
|
+
// Skip them for local marketplace base inference.
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
// Invalid source spec; skip this entry.
|
|
129
|
+
}
|
|
130
|
+
}
|
|
104
131
|
if (!relRaw)
|
|
105
132
|
continue;
|
|
106
133
|
const rel = normalizeRel(relRaw);
|
|
@@ -130,6 +157,32 @@ export async function detectBase(resourcePath, repoRoot, platformsConfig) {
|
|
|
130
157
|
if (patternResult.matchType !== 'none') {
|
|
131
158
|
return patternResult;
|
|
132
159
|
}
|
|
160
|
+
// Priority 5: Resource-direct resolution.
|
|
161
|
+
// When an explicit resourcePath was provided and all other detection methods failed or
|
|
162
|
+
// resolved to the repo root (marketplace fallback), resolve directly to the resource path.
|
|
163
|
+
// This ensures that "install this specific resource" always wins over "this is a marketplace."
|
|
164
|
+
// A base must always be a directory, so if resourcePath points to a file, use its parent.
|
|
165
|
+
if (resourcePath && !isAbsolute(resourcePath)) {
|
|
166
|
+
const directPath = resolve(repoRootResolved, resourcePath);
|
|
167
|
+
if (await exists(directPath)) {
|
|
168
|
+
let directBase;
|
|
169
|
+
try {
|
|
170
|
+
const s = await stat(directPath);
|
|
171
|
+
directBase = s.isDirectory() ? directPath : dirname(directPath);
|
|
172
|
+
}
|
|
173
|
+
catch {
|
|
174
|
+
directBase = directPath;
|
|
175
|
+
}
|
|
176
|
+
logger.info('Base resolved directly from explicit resourcePath', {
|
|
177
|
+
resourcePath,
|
|
178
|
+
base: directBase
|
|
179
|
+
});
|
|
180
|
+
return {
|
|
181
|
+
base: directBase,
|
|
182
|
+
matchType: 'resource-direct'
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
}
|
|
133
186
|
// Fallback: if we discovered a marketplace root and nothing else matched, return marketplace.
|
|
134
187
|
if (marketplaceRoot) {
|
|
135
188
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-detector.js","sourceRoot":"","sources":["../../../src/core/install/base-detector.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"base-detector.js","sourceRoot":"","sources":["../../../src/core/install/base-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import type { PromptPort } from '../../ports/prompt.js';
|
|
|
9
9
|
import type { InstallOptions } from '../../../types/index.js';
|
|
10
10
|
import type { WorkspaceConflictOwner } from '../../../utils/workspace-index-ownership.js';
|
|
11
11
|
import type { WorkspaceIndexFileMapping } from '../../../types/workspace-index.js';
|
|
12
|
+
import type { IndexWriteCollector } from '../wave-resolver/index-write-collector.js';
|
|
12
13
|
import { type ExpandedIndexesContext } from '../index-based-installer.js';
|
|
13
14
|
type ConflictResolution = 'namespace' | 'skip' | 'overwrite';
|
|
14
15
|
interface PackageIndexRecord {
|
|
@@ -152,9 +153,10 @@ export declare function classifyFileConflict(targetRelPath: string, ownershipCon
|
|
|
152
153
|
* @param relPath - Workspace-relative path (for display / per-path key lookup)
|
|
153
154
|
* @param ownerName - Package name of the owner (only relevant for 'owned-by-other')
|
|
154
155
|
* @param sourcePath - Package-relative source path (shown in prompts)
|
|
155
|
-
* @param options
|
|
156
|
-
* @param interactive
|
|
157
|
-
*
|
|
156
|
+
* @param options - Install options carrying force / conflictStrategy / conflictDecisions
|
|
157
|
+
* @param interactive - Whether prompts are allowed for conflict resolution
|
|
158
|
+
* (derived from InteractionPolicy at the call site)
|
|
159
|
+
* @param forceOverwrite - True when the package-level phase confirmed an overwrite for this pkg
|
|
158
160
|
*/
|
|
159
161
|
export declare function resolveFileConflict(conflictType: 'owned-by-other' | 'exists-unowned', relPath: string, ownerName: string | undefined, sourcePath: string | undefined, options: InstallOptions, interactive: boolean, forceOverwrite: boolean, prompt?: PromptPort): Promise<{
|
|
160
162
|
decision: ConflictResolution;
|
|
@@ -172,7 +174,7 @@ export declare function resolveFileConflict(conflictType: 'owned-by-other' | 'ex
|
|
|
172
174
|
* @param ownerNamespaceSlug The derived short slug for the owner package
|
|
173
175
|
* (computed via deriveNamespaceSlug).
|
|
174
176
|
*/
|
|
175
|
-
export declare function executeNamespace(cwd: string, targetRelPath: string, owner: WorkspaceConflictOwner, ownershipContext: OwnershipContext, flowToPattern: string | undefined, dryRun: boolean, ownerNamespaceSlug: string): Promise<{
|
|
177
|
+
export declare function executeNamespace(cwd: string, targetRelPath: string, owner: WorkspaceConflictOwner, ownershipContext: OwnershipContext, flowToPattern: string | undefined, dryRun: boolean, ownerNamespaceSlug: string, indexWriteCollector?: IndexWriteCollector): Promise<{
|
|
176
178
|
ownerNamespacedPath: string;
|
|
177
179
|
warning: string;
|
|
178
180
|
}>;
|
|
@@ -210,6 +212,6 @@ export declare function executeNamespace(cwd: string, targetRelPath: string, own
|
|
|
210
212
|
* @param installingPackageName - Name of the package being installed (used as namespace dir)
|
|
211
213
|
* @param forceOverwrite - True when the package-level phase confirmed an overwrite
|
|
212
214
|
*/
|
|
213
|
-
export declare function resolveConflictsForTargets(cwd: string, targets: TargetEntry[], ownershipContext: OwnershipContext, options: InstallOptions, installingPackageName: string, forceOverwrite?: boolean, prompt?: PromptPort): Promise<ConflictResolutionResult>;
|
|
215
|
+
export declare function resolveConflictsForTargets(cwd: string, targets: TargetEntry[], ownershipContext: OwnershipContext, options: InstallOptions, installingPackageName: string, forceOverwrite?: boolean, prompt?: PromptPort, canPrompt?: boolean, indexWriteCollector?: IndexWriteCollector): Promise<ConflictResolutionResult>;
|
|
214
216
|
export {};
|
|
215
217
|
//# sourceMappingURL=file-conflict-resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-conflict-resolver.d.ts","sourceRoot":"","sources":["../../../../src/core/install/conflicts/file-conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,6BAA6B,CAAC;AAMrC,KAAK,kBAAkB,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;AAE7D,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,yBAAyB,CAAC,EAAE,CAAC,CAAC;CAC/D;AAMD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAE5E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,gBAAgB,CAAC;IACvB,yCAAyC;IACzC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,sBAAsB,CAAC;IACxC,uFAAuF;IACvF,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,mFAAmF;IACnF,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CACjD;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,gGAAgG;AAChG,MAAM,WAAW,aAAa;IAC5B,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,wBAAwB;IACvC,gGAAgG;IAChG,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAmHD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,MAAM,CAkDR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAsBnF;
|
|
1
|
+
{"version":3,"file":"file-conflict-resolver.d.ts","sourceRoot":"","sources":["../../../../src/core/install/conflicts/file-conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,6BAA6B,CAAC;AAMrC,KAAK,kBAAkB,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;AAE7D,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,yBAAyB,CAAC,EAAE,CAAC,CAAC;CAC/D;AAMD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAE5E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,gBAAgB,CAAC;IACvB,yCAAyC;IACzC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,sBAAsB,CAAC;IACxC,uFAAuF;IACvF,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,mFAAmF;IACnF,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CACjD;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,gGAAgG;AAChG,MAAM,WAAW,aAAa;IAC5B,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,wBAAwB;IACvC,gGAAgG;IAChG,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAmHD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,MAAM,CAkDR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAsBnF;AAiFD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,yBAAyB,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,GACvF,OAAO,CAAC,gBAAgB,CAAC,CAqB3B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,gBAAgB,GACjC,gBAAgB,CAelB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,EACjD,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,OAAO,EACvB,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC;IAAE,QAAQ,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqD7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,sBAAsB,EAC7B,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,MAAM,EAAE,OAAO,EACf,kBAAkB,EAAE,MAAM,EAC1B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAoC3D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,EAAE,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,cAAc,EACvB,qBAAqB,EAAE,MAAM,EAC7B,cAAc,GAAE,OAAe,EAC/B,MAAM,CAAC,EAAE,UAAU,EACnB,SAAS,CAAC,EAAE,OAAO,EACnB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,wBAAwB,CAAC,CA2PnC"}
|
|
@@ -215,7 +215,7 @@ export function namespaceFlowToPattern(pattern, packageName) {
|
|
|
215
215
|
// ============================================================================
|
|
216
216
|
// Private: update owner's workspace index after a namespace move
|
|
217
217
|
// ============================================================================
|
|
218
|
-
async function updateOwnerIndexAfterRename(cwd, owner, oldRelPath, newRelPath, indexByPackage) {
|
|
218
|
+
async function updateOwnerIndexAfterRename(cwd, owner, oldRelPath, newRelPath, indexByPackage, indexWriteCollector) {
|
|
219
219
|
const normalizedOld = normalizePathForProcessing(oldRelPath);
|
|
220
220
|
const normalizedNew = normalizePathForProcessing(newRelPath);
|
|
221
221
|
const record = indexByPackage.get(owner.packageName);
|
|
@@ -237,6 +237,21 @@ async function updateOwnerIndexAfterRename(cwd, owner, oldRelPath, newRelPath, i
|
|
|
237
237
|
: { ...oldMapping, target: normalizedNew };
|
|
238
238
|
}
|
|
239
239
|
// dir-key owners: directory key is still valid after rename, nothing to change.
|
|
240
|
+
// Defer to collector if present (parallel install mode)
|
|
241
|
+
if (indexWriteCollector) {
|
|
242
|
+
indexWriteCollector.recordFileMappingRename({
|
|
243
|
+
packageName: owner.packageName,
|
|
244
|
+
indexKey: owner.key,
|
|
245
|
+
oldTargetPath: normalizedOld,
|
|
246
|
+
newTargetPath: normalizedNew,
|
|
247
|
+
entrySnapshot: {
|
|
248
|
+
path: record.path,
|
|
249
|
+
version: record.workspace?.version,
|
|
250
|
+
files: record.files,
|
|
251
|
+
},
|
|
252
|
+
});
|
|
253
|
+
return;
|
|
254
|
+
}
|
|
240
255
|
// Persist to workspace index
|
|
241
256
|
const wsRecord = await readWorkspaceIndex(cwd);
|
|
242
257
|
wsRecord.index.packages = wsRecord.index.packages ?? {};
|
|
@@ -320,9 +335,10 @@ export function classifyFileConflict(targetRelPath, ownershipContext) {
|
|
|
320
335
|
* @param relPath - Workspace-relative path (for display / per-path key lookup)
|
|
321
336
|
* @param ownerName - Package name of the owner (only relevant for 'owned-by-other')
|
|
322
337
|
* @param sourcePath - Package-relative source path (shown in prompts)
|
|
323
|
-
* @param options
|
|
324
|
-
* @param interactive
|
|
325
|
-
*
|
|
338
|
+
* @param options - Install options carrying force / conflictStrategy / conflictDecisions
|
|
339
|
+
* @param interactive - Whether prompts are allowed for conflict resolution
|
|
340
|
+
* (derived from InteractionPolicy at the call site)
|
|
341
|
+
* @param forceOverwrite - True when the package-level phase confirmed an overwrite for this pkg
|
|
326
342
|
*/
|
|
327
343
|
export async function resolveFileConflict(conflictType, relPath, ownerName, sourcePath, options, interactive, forceOverwrite, prompt) {
|
|
328
344
|
const perPathDecisions = options.conflictDecisions ?? {};
|
|
@@ -383,7 +399,7 @@ export async function resolveFileConflict(conflictType, relPath, ownerName, sour
|
|
|
383
399
|
* @param ownerNamespaceSlug The derived short slug for the owner package
|
|
384
400
|
* (computed via deriveNamespaceSlug).
|
|
385
401
|
*/
|
|
386
|
-
export async function executeNamespace(cwd, targetRelPath, owner, ownershipContext, flowToPattern, dryRun, ownerNamespaceSlug) {
|
|
402
|
+
export async function executeNamespace(cwd, targetRelPath, owner, ownershipContext, flowToPattern, dryRun, ownerNamespaceSlug, indexWriteCollector) {
|
|
387
403
|
const normalized = normalizePathForProcessing(targetRelPath);
|
|
388
404
|
const ownerNamespacedPath = generateNamespacedPath(normalized, ownerNamespaceSlug, flowToPattern);
|
|
389
405
|
if (dryRun) {
|
|
@@ -396,7 +412,7 @@ export async function executeNamespace(cwd, targetRelPath, owner, ownershipConte
|
|
|
396
412
|
const absNamespaced = join(cwd, ownerNamespacedPath);
|
|
397
413
|
await ensureDir(dirname(absNamespaced));
|
|
398
414
|
await fs.rename(absTarget, absNamespaced);
|
|
399
|
-
await updateOwnerIndexAfterRename(cwd, owner, normalized, ownerNamespacedPath, ownershipContext.indexByPackage);
|
|
415
|
+
await updateOwnerIndexAfterRename(cwd, owner, normalized, ownerNamespacedPath, ownershipContext.indexByPackage, indexWriteCollector);
|
|
400
416
|
// Update in-memory ownership map so subsequent targets in this run see the move
|
|
401
417
|
ownershipContext.expandedIndexes.installedPathOwners.delete(normalized);
|
|
402
418
|
ownershipContext.expandedIndexes.installedPathOwners.set(normalizePathForProcessing(ownerNamespacedPath), owner);
|
|
@@ -439,9 +455,9 @@ export async function executeNamespace(cwd, targetRelPath, owner, ownershipConte
|
|
|
439
455
|
* @param installingPackageName - Name of the package being installed (used as namespace dir)
|
|
440
456
|
* @param forceOverwrite - True when the package-level phase confirmed an overwrite
|
|
441
457
|
*/
|
|
442
|
-
export async function resolveConflictsForTargets(cwd, targets, ownershipContext, options, installingPackageName, forceOverwrite = false, prompt) {
|
|
458
|
+
export async function resolveConflictsForTargets(cwd, targets, ownershipContext, options, installingPackageName, forceOverwrite = false, prompt, canPrompt, indexWriteCollector) {
|
|
443
459
|
const warnings = [];
|
|
444
|
-
const interactive = options.interactive ?? false;
|
|
460
|
+
const interactive = canPrompt ?? options.interactive ?? false;
|
|
445
461
|
const isDryRun = Boolean(options.dryRun);
|
|
446
462
|
// -------------------------------------------------------------------------
|
|
447
463
|
// Compute namespace slugs for all known packages
|
|
@@ -534,7 +550,7 @@ export async function resolveConflictsForTargets(cwd, targets, ownershipContext,
|
|
|
534
550
|
// Move the existing owner's file into its namespace
|
|
535
551
|
const ownerSlug = slugByPackageName.get(cls.owner.packageName)
|
|
536
552
|
?? deriveNamespaceSlug(cls.owner.packageName, existingSlugs);
|
|
537
|
-
const { ownerNamespacedPath, warning: nsWarn } = await executeNamespace(cwd, target.relPath, cls.owner, ownershipContext, target.flowToPattern, isDryRun, ownerSlug);
|
|
553
|
+
const { ownerNamespacedPath, warning: nsWarn } = await executeNamespace(cwd, target.relPath, cls.owner, ownershipContext, target.flowToPattern, isDryRun, ownerSlug, indexWriteCollector);
|
|
538
554
|
warnings.push(nsWarn);
|
|
539
555
|
relocatedFiles.push({ from: normalizePathForProcessing(target.relPath), to: ownerNamespacedPath });
|
|
540
556
|
// Rewrite this incoming target to its namespaced path
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-conflict-resolver.js","sourceRoot":"","sources":["../../../../src/core/install/conflicts/file-conflict-resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"file-conflict-resolver.js","sourceRoot":"","sources":["../../../../src/core/install/conflicts/file-conflict-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
import type { Platform } from '../platforms.js';
|
|
16
16
|
import type { InstallOptions } from '../../types/index.js';
|
|
17
17
|
import type { RelocatedFile } from './conflicts/file-conflict-resolver.js';
|
|
18
|
+
import type { IndexWriteCollector } from './wave-resolver/index-write-collector.js';
|
|
18
19
|
export interface IndexInstallResult {
|
|
19
20
|
installed: number;
|
|
20
21
|
updated: number;
|
|
@@ -42,5 +43,5 @@ marketplaceMetadata?: {
|
|
|
42
43
|
resourceVersion?: string, // Resource-specific version (for agents/skills)
|
|
43
44
|
originalContentRoot?: string, // Original source path before conversion (for index)
|
|
44
45
|
forceOverwrite?: boolean, // Phase 5: Package was confirmed for overwrite at package-level conflict phase
|
|
45
|
-
prompt?: import('../ports/prompt.js').PromptPort): Promise<IndexInstallResult>;
|
|
46
|
+
prompt?: import('../ports/prompt.js').PromptPort, indexWriteCollector?: IndexWriteCollector, sharedOwnershipContext?: import('./conflicts/file-conflict-resolver.js').OwnershipContext): Promise<IndexInstallResult>;
|
|
46
47
|
//# sourceMappingURL=flow-index-installer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-index-installer.d.ts","sourceRoot":"","sources":["../../../src/core/install/flow-index-installer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAiBH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"flow-index-installer.d.ts","sourceRoot":"","sources":["../../../src/core/install/flow-index-installer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAiBH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAgBpF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,6EAA6E;IAC7E,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC;AAgBD;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,QAAQ,EAAE,EACrB,OAAO,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,GAAG,EAAG,mDAAmD;AACzE,mBAAmB,CAAC,EAAE;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,cAAc,CAAC,EAAE,MAAM,EAAG,uCAAuC;AACjE,eAAe,CAAC,EAAE,MAAM,EAAG,gDAAgD;AAC3E,mBAAmB,CAAC,EAAE,MAAM,EAAG,qDAAqD;AACpF,cAAc,CAAC,EAAE,OAAO,EAAG,+EAA+E;AAC1G,MAAM,CAAC,EAAE,OAAO,oBAAoB,EAAE,UAAU,EAChD,mBAAmB,CAAC,EAAE,mBAAmB,EACzC,sBAAsB,CAAC,EAAE,OAAO,uCAAuC,EAAE,gBAAgB,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAqO7B"}
|
|
@@ -37,7 +37,7 @@ marketplaceMetadata, matchedPattern, // Phase 4: Pattern from base detection
|
|
|
37
37
|
resourceVersion, // Resource-specific version (for agents/skills)
|
|
38
38
|
originalContentRoot, // Original source path before conversion (for index)
|
|
39
39
|
forceOverwrite, // Phase 5: Package was confirmed for overwrite at package-level conflict phase
|
|
40
|
-
prompt) {
|
|
40
|
+
prompt, indexWriteCollector, sharedOwnershipContext) {
|
|
41
41
|
logger.debug(`Installing ${packageName}@${version} with flows for platforms: ${platforms.join(', ')}`);
|
|
42
42
|
// Resolve package root
|
|
43
43
|
const resolvedContentRoot = contentRoot ?? await resolvePackageContentRoot({
|
|
@@ -142,7 +142,10 @@ prompt) {
|
|
|
142
142
|
conversionContext,
|
|
143
143
|
// Phase 4: Pass resource filtering info
|
|
144
144
|
matchedPattern,
|
|
145
|
-
prompt
|
|
145
|
+
prompt,
|
|
146
|
+
// Parallel install support
|
|
147
|
+
sharedOwnershipContext,
|
|
148
|
+
indexWriteCollector
|
|
146
149
|
};
|
|
147
150
|
try {
|
|
148
151
|
const result = await installPackageWithFlows(installContext, options, forceOverwrite ?? false);
|
|
@@ -226,7 +229,7 @@ prompt) {
|
|
|
226
229
|
: (dirGlobPrefix && dirGlobPrefix.length > 0)
|
|
227
230
|
? join(basePathForIndex, dirGlobPrefix)
|
|
228
231
|
: basePathForIndex;
|
|
229
|
-
await updateWorkspaceIndexForFlows(cwd, packageName, version, indexSourcePath, fileMapping, marketplaceMetadata, resourceVersion);
|
|
232
|
+
await updateWorkspaceIndexForFlows(cwd, packageName, version, indexSourcePath, fileMapping, marketplaceMetadata, resourceVersion, indexWriteCollector);
|
|
230
233
|
}
|
|
231
234
|
// Set result files
|
|
232
235
|
aggregatedResult.files = Array.from(allTargetPaths);
|
|
@@ -239,7 +242,19 @@ prompt) {
|
|
|
239
242
|
/**
|
|
240
243
|
* Update workspace index with flow-based installation results
|
|
241
244
|
*/
|
|
242
|
-
async function updateWorkspaceIndexForFlows(cwd, packageName, version, packagePath, fileMapping, marketplaceMetadata, resourceVersion) {
|
|
245
|
+
async function updateWorkspaceIndexForFlows(cwd, packageName, version, packagePath, fileMapping, marketplaceMetadata, resourceVersion, indexWriteCollector) {
|
|
246
|
+
const effectiveVersion = resourceVersion ?? version;
|
|
247
|
+
// Defer to collector if present (parallel install mode)
|
|
248
|
+
if (indexWriteCollector) {
|
|
249
|
+
indexWriteCollector.recordPackageUpdate({
|
|
250
|
+
packageName,
|
|
251
|
+
path: packagePath,
|
|
252
|
+
version: effectiveVersion,
|
|
253
|
+
files: fileMapping,
|
|
254
|
+
marketplace: marketplaceMetadata,
|
|
255
|
+
});
|
|
256
|
+
return;
|
|
257
|
+
}
|
|
243
258
|
try {
|
|
244
259
|
const wsRecord = await readWorkspaceIndex(cwd);
|
|
245
260
|
// Initialize packages map if needed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-index-installer.js","sourceRoot":"","sources":["../../../src/core/install/flow-index-installer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"flow-index-installer.js","sourceRoot":"","sources":["../../../src/core/install/flow-index-installer.ts"],"names":[],"mappings":"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"}
|